Online Accounts: Account plugins

Merge lp:~andrewsomething/account-plugins/instagram into lp:account-plugins

  1. instagram
  2. Merge into trunk
Proposed by Andrew Starr-Bochicchio
Status: Merged
Approved by: Víctor R. Ruiz
Approved revision: 102
Merged at revision: 101
Proposed branch: lp:~andrewsomething/account-plugins/instagram
Merge into: lp:account-plugins
Diff against target: 191 lines (+86/-1)
10 files modified
Makefile.am (+3/-0)
configure.ac (+15/-0)
data/providers/instagram.provider.in.in (+27/-0)
data/services/instagram-microblog.service.in (+21/-0)
data/webkit-options/api.instagram.com.conf (+2/-0)
debian/account-plugin-instagram.install (+3/-0)
debian/changelog (+3/-0)
debian/control (+8/-0)
debian/rules (+3/-1)
po/POTFILES.skip (+1/-0)
To merge this branch: bzr merge lp:~andrewsomething/account-plugins/instagram
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot (community) continuous-integration Approve
Alberto Mardegan (community) Approve
Andrew Starr-Bochicchio (community) Approve
Review via email: mp+158442@code.launchpad.net

Commit message

Added account-plugin-instagram (LP: #1167449).

Description of the change

Add support for instagram as first step to adding instagram to friends-app.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Hi Andrew, , thank you very much for your contribution. We'd love to see it incorporate in to Ubuntu, but first I need to ask you to sign the contributor agreement. It's a straight forward process, and you can find full details here:

http://www.canonical.com/contributors

Please let me know once you've completed the form.

On the code front, I'd like to suggest you a change:
87 + <setting type="as" name="Scope">['likes+comments']</setting>

Instead of "likes+comments", try to write this as:
  <setting type="as" name="Scope">['likes', 'comments']</setting>

Our oauth plugin should concatenate the two strings as appropriate, but just to be on the safe side please test it once more, after having made the change.

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Done and done. A MP against friends should be up soon as well.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Hi Andrew! Sorry for taking so long for replying! It looks good to me know, thanks a lot! :-)

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~andrewsomething/account-plugins/instagram/+merge/158442/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Adding a merge commit message to try to make the auto-lander happy.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/account-plugins-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-plugins-raring-amd64-autolanding/3/console

review: Needs Fixing (continuous-integration)
lp:~andrewsomething/account-plugins/instagram updated
102. By Andrew Starr-Bochicchio

Remerge on trunk to resolve conflict in debian/changelog.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Ops! Andrew, can you please fix the conflict in debian/changelog?

review: Needs Fixing
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Done. Thanks!

Revision history for this message
Alberto Mardegan (mardy) wrote :

Looks good to me. I'm adding Ken to the reviewers just to make sure that the change in debian/changelog is OK.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2013-04-02 13:00:57 +0000
+++ Makefile.am 2013-04-29 17:24:26 +0000
@@ -61,6 +61,7 @@
61 data/providers/google.provider.in.in \61 data/providers/google.provider.in.in \
62 data/providers/identica.provider.in.in \62 data/providers/identica.provider.in.in \
63 data/providers/linkedin.provider.in.in \63 data/providers/linkedin.provider.in.in \
64 data/providers/instagram.provider.in.in \
64 data/providers/sina.provider.in.in \65 data/providers/sina.provider.in.in \
65 data/providers/sohu.provider.in.in \66 data/providers/sohu.provider.in.in \
66 data/providers/twitter.provider.in.in \67 data/providers/twitter.provider.in.in \
@@ -85,6 +86,7 @@
85 data/services/google-im.service.in \86 data/services/google-im.service.in \
86 data/services/identica-microblog.service.in \87 data/services/identica-microblog.service.in \
87 data/services/linkedin-microblog.service.in \88 data/services/linkedin-microblog.service.in \
89 data/services/instagram-microblog.service.in \
88 data/services/picasa.service.in \90 data/services/picasa.service.in \
89 data/services/sina-microblog.service.in \91 data/services/sina-microblog.service.in \
90 data/services/sohu-microblog.service.in \92 data/services/sohu-microblog.service.in \
@@ -97,6 +99,7 @@
97webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d99webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d
98dist_webkitoptions_DATA = \100dist_webkitoptions_DATA = \
99 data/webkit-options/accounts.google.com.conf \101 data/webkit-options/accounts.google.com.conf \
102 data/webkit-options/api.instagram.com.conf \
100 data/webkit-options/api.weibo.com.conf \103 data/webkit-options/api.weibo.com.conf \
101 data/webkit-options/api.t.sohu.com.conf \104 data/webkit-options/api.t.sohu.com.conf \
102 data/webkit-options/api.twitter.com.conf \105 data/webkit-options/api.twitter.com.conf \
103106
=== modified file 'configure.ac'
--- configure.ac 2013-04-12 14:11:16 +0000
+++ configure.ac 2013-04-29 17:24:26 +0000
@@ -100,6 +100,20 @@
100AC_SUBST(LINKEDIN_CONSUMER_KEY, ["$linkedin_consumer_key"])100AC_SUBST(LINKEDIN_CONSUMER_KEY, ["$linkedin_consumer_key"])
101AC_SUBST(LINKEDIN_CONSUMER_SECRET, ["$linkedin_consumer_secret"])101AC_SUBST(LINKEDIN_CONSUMER_SECRET, ["$linkedin_consumer_secret"])
102102
103# Set Instagram client id/secret.
104AC_ARG_WITH(instagram-client-id,
105 [AS_HELP_STRING([--with-instagram-client-id],
106 [instagram client id])],
107 [instagram_client_id=$withval],
108 [instagram_client_id="01c3df41a2274a14882adea8e8ebbd46"])
109AC_ARG_WITH(instagram-client-secret,
110 [AS_HELP_STRING([--with-instagram-client-secret],
111 [instagram client secret])],
112 [instagram_client_secret=$withval],
113 [instagram_client_secret="4751ccdc39c648719ea83cfb1c866c26"])
114AC_SUBST(INSTAGRAM_CLIENT_ID, ["$instagram_client_id"])
115AC_SUBST(INSTAGRAM_CLIENT_SECRET, ["$instagram_client_secret"])
116
103# Set Facebook client id117# Set Facebook client id
104AC_ARG_WITH(facebook-client-id,118AC_ARG_WITH(facebook-client-id,
105 [AS_HELP_STRING([--with-facebook-client-id],119 [AS_HELP_STRING([--with-facebook-client-id],
@@ -201,6 +215,7 @@
201 data/providers/google.provider.in215 data/providers/google.provider.in
202 data/providers/identica.provider.in216 data/providers/identica.provider.in
203 data/providers/linkedin.provider.in217 data/providers/linkedin.provider.in
218 data/providers/instagram.provider.in
204 data/providers/sina.provider.in219 data/providers/sina.provider.in
205 data/providers/sohu.provider.in220 data/providers/sohu.provider.in
206 data/providers/twitter.provider.in221 data/providers/twitter.provider.in
207222
=== added file 'data/providers/instagram.provider.in.in'
--- data/providers/instagram.provider.in.in 1970-01-01 00:00:00 +0000
+++ data/providers/instagram.provider.in.in 2013-04-29 17:24:26 +0000
@@ -0,0 +1,27 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<provider id="instagram">
3 <name>Instagram</name>
4 <icon>instagram</icon>
5 <domains>*instagram\.com</domains>
6 <translations>account-plugins</translations>
7 <plugin>generic-oauth</plugin>
8
9 <template>
10 <group name="auth">
11 <setting name="method">oauth2</setting>
12 <setting name="mechanism">web_server</setting>
13 <group name="oauth2">
14 <group name="web_server">
15 <setting name="Host">api.instagram.com</setting>
16 <setting name="AuthPath">oauth/authorize</setting>
17 <setting name="TokenPath">oauth/access_token</setting>
18 <setting name="ClientId">@INSTAGRAM_CLIENT_ID@</setting>
19 <setting name="ClientSecret">@INSTAGRAM_CLIENT_SECRET@</setting>
20 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
21 <setting name="ResponseType">code</setting>
22 <setting type="as" name="Scope">['likes', 'comments']</setting>
23 </group>
24 </group>
25 </group>
26 </template>
27</provider>
028
=== added file 'data/services/instagram-microblog.service.in'
--- data/services/instagram-microblog.service.in 1970-01-01 00:00:00 +0000
+++ data/services/instagram-microblog.service.in 2013-04-29 17:24:26 +0000
@@ -0,0 +1,21 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="linkedin-microblog">
3 <type>microblogging</type>
4 <name>Instagram</name>
5 <icon>instagram</icon>
6 <provider>instagram</provider>
7 <translations>account-plugins</translations>
8
9 <!-- default settings (account settings have precedence over these) -->
10 <template>
11 <group name="friends">
12 <setting name="send_enabled" type="bool">false</setting>
13 <setting name="color">#416F96</setting>
14 </group>
15 <group name="gwibber">
16 <setting name="send_enabled" type="bool">false</setting>
17 <setting name="color">#416F96</setting>
18 </group>
19 </template>
20
21</service>
022
=== added file 'data/webkit-options/api.instagram.com.conf'
--- data/webkit-options/api.instagram.com.conf 1970-01-01 00:00:00 +0000
+++ data/webkit-options/api.instagram.com.conf 2013-04-29 17:24:26 +0000
@@ -0,0 +1,2 @@
1UsernameField = input[id="username"]
2PasswordField = input[id="password"]
03
=== added file 'debian/account-plugin-instagram.install'
--- debian/account-plugin-instagram.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-instagram.install 2013-04-29 17:24:26 +0000
@@ -0,0 +1,3 @@
1etc/signon-ui/webkit-options.d/api.instagram.com.conf
2usr/share/accounts/services/instagram-microblog.service
3usr/share/accounts/providers/instagram.provider
04
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-26 18:18:50 +0000
+++ debian/changelog 2013-04-29 17:24:26 +0000
@@ -9,6 +9,9 @@
9 [ Ken VanDine ]9 [ Ken VanDine ]
10 * Automatic snapshot from revision 98 (bootstrap)10 * Automatic snapshot from revision 98 (bootstrap)
1111
12 [ Andrew Starr-Bochicchio ]
13 * Added account-plugin-instagram (LP: #1167449).
14
12 -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Apr 2013 14:17:51 -040015 -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Apr 2013 14:17:51 -0400
1316
14account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low17account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
1518
=== modified file 'debian/control'
--- debian/control 2013-03-20 15:40:18 +0000
+++ debian/control 2013-04-29 17:24:26 +0000
@@ -109,6 +109,14 @@
109Description: GNOME Control Center account plugin for single signon - LinkedIn109Description: GNOME Control Center account plugin for single signon - LinkedIn
110 GNOME Control Center account plugins for single signon110 GNOME Control Center account plugins for single signon
111111
112Package: account-plugin-instagram
113Architecture: any
114Depends: ${misc:Depends},
115 account-plugin-generic-oauth,
116 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
117Description: GNOME Control Center account plugin for single signon - Instagram
118 GNOME Control Center account plugins for single signon
119
112Package: account-plugin-tools120Package: account-plugin-tools
113Architecture: any121Architecture: any
114Depends: ${shlibs:Depends}, ${misc:Depends},122Depends: ${shlibs:Depends}, ${misc:Depends},
115123
=== modified file 'debian/rules'
--- debian/rules 2013-03-20 13:41:47 +0000
+++ debian/rules 2013-04-29 17:24:26 +0000
@@ -17,7 +17,9 @@
17 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \17 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
18 --with-flickr-consumer-secret="4c7e48102c226509" \18 --with-flickr-consumer-secret="4c7e48102c226509" \
19 --with-linkedin-consumer-key="34gnzrg96iq5" \19 --with-linkedin-consumer-key="34gnzrg96iq5" \
20 --with-linkedin-consumer-secret="BazRki2LE8eZtcqh"20 --with-linkedin-consumer-secret="BazRki2LE8eZtcqh" \
21 --with-instagram-client-id="01c3df41a2274a14882adea8e8ebbd46" \
22 --with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26"
2123
22override_dh_install:24override_dh_install:
23 rm -f debian/*/usr/lib/*/*/*.la25 rm -f debian/*/usr/lib/*/*/*.la
2426
=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip 2013-03-21 08:24:18 +0000
+++ po/POTFILES.skip 2013-04-29 17:24:26 +0000
@@ -1,5 +1,6 @@
1data/services/facebook-microblog.service.in1data/services/facebook-microblog.service.in
2data/services/identica-microblog.service.in2data/services/identica-microblog.service.in
3data/services/instagram-microblog.service.in
3data/services/linkedin-microblog.service.in4data/services/linkedin-microblog.service.in
4data/services/twitter-microblog.service.in5data/services/twitter-microblog.service.in
56

Subscribers

People subscribed via source and target branches