wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-02-11 14:30:20 +01:00
parent e1c8080e8f
commit 6f6a593984
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/PublicAndExternalNoticeStream.php
View File

@ -71,8 +71,13 @@ class RawPublicAndExternalNoticeStream extends NoticeStream
$notice->whereAdd('is_local !='. Notice::GATEWAY);
$notice->whereAdd('repeat_of IS NULL');
Notice::addWhereSinceId($notice, $since_id);
Notice::addWhereMaxId($notice, $max_id);
if(!empty($max_id) && is_numeric($max_id)) {
$notice->whereAdd('id < '.$max_id);
}
if(!empty($since_id) && is_numeric($since_id)) {
$notice->whereAdd('id > '.$since_id);
}
$ids = array();

4
doc/en/terms.html
View File

@ -5,8 +5,8 @@ direction this instance is going, you are free to move to another instance or st
You will still be able to follow and be followed (and blocked) by users on this instance.</p>
<p>In constrast to the top-down authority of commercial social media, this creates a kind
of flat power structure. We are enabled to protect eachother from harassment and opression,
but without censorship.</p>
of flat power structure. We are enabled to protect eachother from harassment and oppression,
but without centralized censorship.</p>
<p>On this instance, users who harass others will be removed. We also take a strong stance
against e.g. racism, sexism, ableism, homo- and transphobia. Such expressions make the

24
js/dom-functions.js
View File

@ -361,21 +361,19 @@ function buildProfileCard(data) {
var followButton = '';
// only add follow button if this is a local user
if(data.is_local == true) {
if(typeof window.loggedIn.screen_name != 'undefined' && window.loggedIn.id != data.id) {
followButton = buildFollowBlockbutton(data);
}
// follow from external instance if logged out and the user is local
if(window.loggedIn === false && data.is_local == true) {
followButton = '<div class="user-actions"><button type="button" class="external-follow-button"><span class="button-text follow-text"><i class="follow"></i>' + window.sL.userExternalFollow + '</span></button></div>';
}
// follow from external instance if logged out
if(typeof window.loggedIn.screen_name == 'undefined') {
followButton = '<div class="user-actions"><button type="button" class="external-follow-button"><span class="button-text follow-text"><i class="follow"></i>' + window.sL.userExternalFollow + '</span></button></div>';
}
// edit profile button if it's me
else if(window.loggedIn !== false && window.loggedIn.id == data.id) {
followButton = '<div class="user-actions"><button type="button" class="edit-profile-button"><span class="button-text edit-profile-text">' + window.sL.editMyProfile + '</span></button></div>';
}
// edit profile button if me
if(typeof window.loggedIn.screen_name != 'undefined' && window.loggedIn.id == data.id) {
followButton = '<div class="user-actions"><button type="button" class="edit-profile-button"><span class="button-text edit-profile-text">' + window.sL.editMyProfile + '</span></button></div>';
}
// follow button for logged in users
else if(window.loggedIn !== false) {
followButton = buildFollowBlockbutton(data);
}
// is webpage empty?

13
js/qvitter.js
View File

@ -1101,11 +1101,16 @@ $('#faq-link').click(function(){
·
· · · · · · · · · · · · · */
$('#tou-link').click(function(){
$('#tou-link,.tou-link').click(function(){
popUpAction('popup-terms', window.sL.showTerms,'<div id="terms-container"></div>',false);
getDoc('terms',function(termsHtml){
$('#terms-container').html(termsHtml);
});
if(window.customTermsOfUse) {
$('#terms-container').html(window.customTermsOfUse);
}
else {
getDoc('terms',function(termsHtml){
$('#terms-container').html(termsHtml);
});
}
});