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
1=== modified file 'plugins/facebook/facebook.go'
2--- plugins/facebook/facebook.go 2014-07-17 18:35:36 +0000
3+++ plugins/facebook/facebook.go 2014-07-24 21:16:22 +0000
4@@ -28,6 +28,8 @@
5
6 var baseUrl, _ = url.Parse("https://graph.facebook.com/v2.0/")
7
8+const facebookIcon = "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook/facebook.png"
9+
10 type fbPlugin struct {
11 lastUpdate string
12 }
13@@ -83,7 +85,12 @@
14 Notification: plugins.Notification{
15 Card: &plugins.Card{
16 Summary: n.Title,
17+ Icon: facebookIcon,
18+ Persist: true,
19+ Popup: true,
20 },
21+ Sound: plugins.DefaultSound(),
22+ Vibrate: plugins.DefaultVibration(),
23 },
24 })
25 if n.UpdatedTime > latestUpdate {
26
27=== modified file 'plugins/gmail/gmail.go'
28--- plugins/gmail/gmail.go 2014-07-23 14:45:26 +0000
29+++ plugins/gmail/gmail.go 2014-07-24 21:16:22 +0000
30@@ -100,13 +100,14 @@
31 Card: &plugins.Card{
32 Summary: fmt.Sprintf("Message \"%s\" from %s", hdr[hdrSUBJECT], hdr[hdrFROM]),
33 Body: msg.Snippet,
34- // TODO this is a placeholder, Actions aren't fully defined yet and opening
35- // multiple inboxes has issues.
36+ // TODO multiple inbox support pending.
37 Actions: []string{"https://mail.google.com/mail/u/0/?pli=1#inbox/" + msg.ThreadId},
38 Icon: gmailIcon,
39 Popup: true,
40 Persist: true,
41 },
42+ Sound: plugins.DefaultSound(),
43+ Vibrate: plugins.DefaultVibration(),
44 },
45 }
46 }
47
48=== modified file 'plugins/plugins.go'
49--- plugins/plugins.go 2014-07-17 18:35:36 +0000
50+++ plugins/plugins.go 2014-07-24 21:16:22 +0000
51@@ -122,3 +122,13 @@
52 PLUGIN_EMAIL = 0
53 PLUGIN_SOCIAL
54 )
55+
56+// DefaultSound returns the path to the default sound for a Notification
57+func DefaultSound() string {
58+ return "/usr/share/sounds/ubuntu/notifications/Slick.ogg"
59+}
60+
61+// DefaultVibration returns a Vibrate with the default vibration
62+func DefaultVibration() *Vibrate {
63+ return &Vibrate{Duration: 200}
64+}
65
66=== modified file 'plugins/twitter/twitter.go'
67--- plugins/twitter/twitter.go 2014-07-23 10:35:13 +0000
68+++ plugins/twitter/twitter.go 2014-07-24 21:16:22 +0000
69@@ -24,9 +24,9 @@
70 "net/url"
71 "strings"
72
73- "launchpad.net/account-polld/plugins/twitter/oauth" // "github.com/garyburd/go-oauth/oauth"
74 "launchpad.net/account-polld/accounts"
75 "launchpad.net/account-polld/plugins"
76+ "launchpad.net/account-polld/plugins/twitter/oauth" // "github.com/garyburd/go-oauth/oauth"
77 )
78
79 var baseUrl, _ = url.Parse("https://api.twitter.com/1.1/")
80@@ -129,7 +129,11 @@
81 Summary: fmt.Sprintf("Direct message from @%s", m.Sender.ScreenName),
82 Body: m.Text,
83 Icon: twitterIcon,
84+ Persist: true,
85+ Popup: true,
86 },
87+ Sound: plugins.DefaultSound(),
88+ Vibrate: plugins.DefaultVibration(),
89 },
90 })
91 if m.Id > latestDM {

Subscribers

People subscribed via source and target branches