easier installation, cover photos now work with 1.1.1-alpha2

QvitterPlugin.php

@@ -203,9 +203,53 @@ class QvitterPlugin extends Plugin {
 
         return true;
     }
+
+
+    /**
+     * Group addresses in API response
+     *
+     * @param Action $action action being executed
+     *
+     * @return boolean hook return
+     */
+
+    function onNoticeSimpleStatusArray($notice, &$twitter_status)
+    {
+    
+		$notice_groups = $notice->getGroups();
+		$group_addressees = false;
+		foreach($notice_groups as $g) {
+		$group_addressees .= '!'.$g->nickname.' ';
+		}
+		$group_addressees = trim($group_addressees);
+		if($group_addressees == '') $group_addressees = false;
+		$twitter_status['statusnet_in_groups'] = $group_addressees;    
+
+        return true;
+    }
+    
+    
+    /**
+     * Cover photo in API response
+     *
+     * @param Action $action action being executed
+     *
+     * @return boolean hook return
+     */
+
+    function onTwitterUserArray($profile, &$twitter_user)
+    {
+
+        $twitter_user['cover_photo'] = Profile_prefs::getConfigData($profile, 'qvitter', 'cover_photo');        
+
+        return true;
+    }    
+    
 }
 
 
+
+
 /**
  * Overwrites variables in URL-mapping
  *

README.md

@@ -2,7 +2,7 @@ Qvitter
 ==========================================
 
 * Author:    Hannes Mannerheim (<h@nnesmannerhe.im>)
-* Last mod.: May, 2014
+* Last mod.: Sept, 2014
 * Version:   3
 * GitHub:    <https://github.com/hannesmannerheim/qvitter>
 
@@ -37,14 +37,7 @@ be opt-in instead.
 
 6. Users can go to ://{instance}/settings/qvitter and enable or disable Qvitter.
 
-Extras
+Note: Qvitter is tested with GNU Social version 1.1.1-alpha2 (7e47026085fa4f2071e694d9c3e3fe2aa5142135).
------
-
-1. There is a bug in GNUsocial that won't let you see groups' members lists. Replace your
-actions/apigroupmembership.php file with the one supplied to fix it.
-
-2. If you want notice headers to show which group a notice is posted in, and if you want 
-cover photos to work, replace your lib/apiaction.php file.
 
 
 TODO

actions/apiupdatecoverphoto.php

@@ -98,7 +98,7 @@ class ApiUpdateCoverPhotoAction extends ApiAuthAction
 		$base64img_mimetype = MediaFile::getUploadedMimeType($base64img_path, $base64img_filename);
 		$mediafile = new MediaFile($profile, $base64img_filename, $base64img_mimetype);
  		$imagefile = new ImageFile($mediafile->fileRecord->id, File::path($mediafile->filename));
-  		$imagefile->resizeTo(File::path($mediafile->filename), $this->cropW, $this->cropH, $this->cropX, $this->cropY, $this->cropW, $this->cropH);			
+  		$imagefile->resizeTo(File::path($mediafile->filename), array($this->cropW, $this->cropH, $this->cropX, $this->cropY, $this->cropW, $this->cropH));			
 		$result['url'] = File::url($mediafile->filename);
 		
 		Profile_prefs::setData($profile, 'qvitter', 'cover_photo', $result['url']);			

edited-gnu-social-files/actions/apigroupmembership.php

@@ -1,181 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * List a group's members
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  API
- * @package   StatusNet
- * @author    Craig Andrews <candrews@integralblue.com>
- * @author    Evan Prodromou <evan@status.net>
- * @author    Jeffery To <jeffery.to@gmail.com>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * List 20 newest members of the group specified by name or ID.
- *
- * @category API
- * @package  StatusNet
- * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@status.net>
- * @author   Jeffery To <jeffery.to@gmail.com>
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-class ApiGroupMembershipAction extends ApiPrivateAuthAction
-{
-    var $group    = null;
-    var $profiles = null;
-
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     */
-    protected function prepare(array $args=array())
-    {
-        parent::prepare($args);
-
-        $this->group    = $this->getTargetGroup($this->arg('id'));
-        if (empty($this->group)) {
-            // TRANS: Client error displayed trying to show group membership on a non-existing group.
-            $this->clientError(_('Group not found.'), 404);
-        }
-
-        $this->profiles = $this->getProfiles();
-
-        return true;
-    }
-
-    /**
-     * Handle the request
-     *
-     * Show the members of the group
-     *
-     * @return void
-     */
-    protected function handle()
-    {
-        parent::handle();
-
-        // XXX: RSS and Atom
-
-        switch($this->format) {
-        case 'xml':
-            $this->showTwitterXmlUsers($this->profiles);
-            break;
-        case 'json':
-            $this->showJsonUsers($this->profiles[0]->_items);
-            break;
-        default:
-            // TRANS: Client error displayed when coming across a non-supported API method.
-            $this->clientError(_('API method not found.'), 404);
-        }
-    }
-
-    /**
-     * Fetch the members of a group
-     *
-     * @return array $profiles list of profiles
-     */
-    function getProfiles()
-    {
-        $profiles = array();
-
-        $profile = $this->group->getMembers(
-            ($this->page - 1) * $this->count,
-            $this->count,
-            $this->since_id,
-            $this->max_id
-        );
-
-        while ($profile->fetch()) {
-            $profiles[] = clone($profile);
-        }
-
-        return $profiles;
-    }
-
-    /**
-     * Is this action read only?
-     *
-     * @param array $args other arguments
-     *
-     * @return boolean true
-     */
-    function isReadOnly($args)
-    {
-        return true;
-    }
-
-    /**
-     * When was this list of profiles last modified?
-     *
-     * @return string datestamp of the lastest profile in the group
-     */
-    function lastModified()
-    {
-        if (!empty($this->profiles) && (count($this->profiles) > 0)) {
-            return strtotime($this->profiles[0]->created);
-        }
-
-        return null;
-    }
-
-    /**
-     * An entity tag for this list of groups
-     *
-     * Returns an Etag based on the action name, language
-     * the group id, and timestamps of the first and last
-     * user who has joined the group
-     *
-     * @return string etag
-     */
-    function etag()
-    {
-        if (!empty($this->profiles) && (count($this->profiles) > 0)) {
-
-            $last = count($this->profiles) - 1;
-
-            return '"' . implode(
-                ':',
-                array($this->arg('action'),
-                      common_user_cache_hash($this->auth_user),
-                      common_language(),
-                      $this->group->id,
-                      strtotime($this->profiles[0]->created),
-                      strtotime($this->profiles[$last]->created))
-            )
-            . '"';
-        }
-
-        return null;
-    }
-}