poll-daemon

Merge lp:~sergiusens/account-polld/card_q into lp:~phablet-team/account-polld/trunk

  1. card_q
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 20
Merged at revision: 19
Proposed branch: lp:~sergiusens/account-polld/card_q
Merge into: lp:~phablet-team/account-polld/trunk
Prerequisite: lp:~sergiusens/account-polld/interval
Diff against target: 91 lines (+25/-3)
4 files modified
plugins/facebook/facebook.go (+7/-0)
plugins/gmail/gmail.go (+3/-2)
plugins/plugins.go (+10/-0)
plugins/twitter/twitter.go (+5/-1)
To merge this branch: bzr merge lp:~sergiusens/account-polld/card_q
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
PS Jenkins bot continuous-integration Approve
Roberto Alsina Pending
Review via email: mp+228198@code.launchpad.net

Commit message

Normalizing notifications.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/account-polld-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/7/rebuild

review: Needs Fixing (continuous-integration)
lp:~sergiusens/account-polld/card_q updated
20. By Sergio Schvezov

Merged interval into card_q.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/account-polld-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/facebook/facebook.go'
--- plugins/facebook/facebook.go 2014-07-17 18:35:36 +0000
+++ plugins/facebook/facebook.go 2014-07-24 21:16:22 +0000
@@ -28,6 +28,8 @@
2828
29var baseUrl, _ = url.Parse("https://graph.facebook.com/v2.0/")29var baseUrl, _ = url.Parse("https://graph.facebook.com/v2.0/")
3030
31const facebookIcon = "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook/facebook.png"
32
31type fbPlugin struct {33type fbPlugin struct {
32 lastUpdate string34 lastUpdate string
33}35}
@@ -83,7 +85,12 @@
83 Notification: plugins.Notification{85 Notification: plugins.Notification{
84 Card: &plugins.Card{86 Card: &plugins.Card{
85 Summary: n.Title,87 Summary: n.Title,
88 Icon: facebookIcon,
89 Persist: true,
90 Popup: true,
86 },91 },
92 Sound: plugins.DefaultSound(),
93 Vibrate: plugins.DefaultVibration(),
87 },94 },
88 })95 })
89 if n.UpdatedTime > latestUpdate {96 if n.UpdatedTime > latestUpdate {
9097
=== modified file 'plugins/gmail/gmail.go'
--- plugins/gmail/gmail.go 2014-07-23 14:45:26 +0000
+++ plugins/gmail/gmail.go 2014-07-24 21:16:22 +0000
@@ -100,13 +100,14 @@
100 Card: &plugins.Card{100 Card: &plugins.Card{
101 Summary: fmt.Sprintf("Message \"%s\" from %s", hdr[hdrSUBJECT], hdr[hdrFROM]),101 Summary: fmt.Sprintf("Message \"%s\" from %s", hdr[hdrSUBJECT], hdr[hdrFROM]),
102 Body: msg.Snippet,102 Body: msg.Snippet,
103 // TODO this is a placeholder, Actions aren't fully defined yet and opening103 // TODO multiple inbox support pending.
104 // multiple inboxes has issues.
105 Actions: []string{"https://mail.google.com/mail/u/0/?pli=1#inbox/" + msg.ThreadId},104 Actions: []string{"https://mail.google.com/mail/u/0/?pli=1#inbox/" + msg.ThreadId},
106 Icon: gmailIcon,105 Icon: gmailIcon,
107 Popup: true,106 Popup: true,
108 Persist: true,107 Persist: true,
109 },108 },
109 Sound: plugins.DefaultSound(),
110 Vibrate: plugins.DefaultVibration(),
110 },111 },
111 }112 }
112 }113 }
113114
=== modified file 'plugins/plugins.go'
--- plugins/plugins.go 2014-07-17 18:35:36 +0000
+++ plugins/plugins.go 2014-07-24 21:16:22 +0000
@@ -122,3 +122,13 @@
122 PLUGIN_EMAIL = 0122 PLUGIN_EMAIL = 0
123 PLUGIN_SOCIAL123 PLUGIN_SOCIAL
124)124)
125
126// DefaultSound returns the path to the default sound for a Notification
127func DefaultSound() string {
128 return "/usr/share/sounds/ubuntu/notifications/Slick.ogg"
129}
130
131// DefaultVibration returns a Vibrate with the default vibration
132func DefaultVibration() *Vibrate {
133 return &Vibrate{Duration: 200}
134}
125135
=== modified file 'plugins/twitter/twitter.go'
--- plugins/twitter/twitter.go 2014-07-23 10:35:13 +0000
+++ plugins/twitter/twitter.go 2014-07-24 21:16:22 +0000
@@ -24,9 +24,9 @@
24 "net/url"24 "net/url"
25 "strings"25 "strings"
2626
27 "launchpad.net/account-polld/plugins/twitter/oauth" // "github.com/garyburd/go-oauth/oauth"
28 "launchpad.net/account-polld/accounts"27 "launchpad.net/account-polld/accounts"
29 "launchpad.net/account-polld/plugins"28 "launchpad.net/account-polld/plugins"
29 "launchpad.net/account-polld/plugins/twitter/oauth" // "github.com/garyburd/go-oauth/oauth"
30)30)
3131
32var baseUrl, _ = url.Parse("https://api.twitter.com/1.1/")32var baseUrl, _ = url.Parse("https://api.twitter.com/1.1/")
@@ -129,7 +129,11 @@
129 Summary: fmt.Sprintf("Direct message from @%s", m.Sender.ScreenName),129 Summary: fmt.Sprintf("Direct message from @%s", m.Sender.ScreenName),
130 Body: m.Text,130 Body: m.Text,
131 Icon: twitterIcon,131 Icon: twitterIcon,
132 Persist: true,
133 Popup: true,
132 },134 },
135 Sound: plugins.DefaultSound(),
136 Vibrate: plugins.DefaultVibration(),
133 },137 },
134 })138 })
135 if m.Id > latestDM {139 if m.Id > latestDM {

Subscribers

People subscribed via source and target branches