From: Marek Marecki <triviuss@gmail.com>
Date: Fri, 3 May 2013 10:19:52 +0000 (+0200)
Subject: Merge branch 'streams' of https://github.com/Javafant/diaspora-api into streams
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4c0ebeafe6bdc25b95fa5f19e7368f7d2ac021db;p=diaspy.git

Merge branch 'streams' of https://github.com/Javafant/diaspora-api into streams

Conflicts:
	diaspy/streams.py
---

4c0ebeafe6bdc25b95fa5f19e7368f7d2ac021db
diff --cc diaspy/streams.py
index 265bed6,a242f08..5b1fb1d
--- a/diaspy/streams.py
+++ b/diaspy/streams.py
@@@ -265,9 -265,15 +265,14 @@@ class FollowedTags(Generic)
          :param tag_name: tag name
          :type tag_name: str
          """
-         data = {'authenticity_token':self._connection.getToken(),
-                 'tag_name':tag_name,
+         data = {'name':tag_name,
+                 'authenticity_token':self._connection.get_token(),
                 }
-         request = self._connection.post('followed_tags', data=data)
-         if request.status_code != 200:
 -
+         headers={'content-type': 'application/json',
+                  'x-csrf-token': self._connection.get_token(),
+                  'accept': 'application/json'}
+ 
+         request = self._connection.post('tag_followings', data=json.dumps(data), headers=headers)
+ 
+         if request.status_code != 201:
              raise Exception('wrong error code: {0}'.format(request.status_code))