Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2017-02-06 00:50:46 -08:00
commit 17bf8bc4eb
17 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -4,6 +4,10 @@
### v1.13.7
**v1.13.7.2** *(2017-02-06)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.7.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.7.2/builds/4chan-X-noupdate.crx)]
- Add `Require OP Quote Link` option (off by default in new installs) to Thread Watcher menu: For purposes of thread watcher highlighting, only consider posts with a quote link to the OP as replies to the OP.
- Turn on `Require OP Quote Link` for upgrading users as it is the old behavior.
**v1.13.7.1** *(2017-02-02)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.7.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.7.1/builds/4chan-X-noupdate.crx)]
- Merge v1.13.5.3: Update for Recaptcha changes.
@ -19,7 +23,7 @@
**v1.13.6.0** *(2017-01-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.6.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.6.0/builds/4chan-X-noupdate.crx)]
- Based on v1.13.5.2.
- Add item in the post menu to mark/unmark posts as yours. #195
- When you are the OP of a thread, any unread reply to the thread will now light up the `Thread Watcher` icon, not just replies directly to you. #913
- When you are the OP of a thread, any unread reply to the thread will now light up the `Thread Watcher` icon, not just replies with quote links to you. #913
- Show `##Manager`, `##Founder`, and `##Verified` capcodes in posts loaded from the archives. Also support searching for them from the post menu.
- Make `Anonymize` more efficient, and extend it to the /f/ index and native catalog. #1111
- If `Quote Preview` is enabled, links to threads in the internal archive will show previews of the OP on hover, as in the native extension. #1256

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.13.7.1
// @version 1.13.7.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

18
builds/4chan-X-beta.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.13.7.1
// @version 1.13.7.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -151,7 +151,7 @@ docSet = function() {
};
g = {
VERSION: '1.13.7.1',
VERSION: '1.13.7.2',
NAMESPACE: '4chan X.',
boards: {}
};
@ -247,7 +247,7 @@ Config = (function() {
'Image Expansion': [true, 'Expand images / videos.'],
'Image Hover': [true, 'Show full image / video on mouseover.'],
'Image Hover in Catalog': [true, 'Show full image / video on mouseover in 4chan X catalog.'],
'Gallery': [true, 'Adds a simple and cute image gallery.'],
'Gallery': [true, 'Adds a simple and cute image gallery. Has more options in the gallery menu.'],
'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1],
'PDF in Gallery': [false, 'Show PDF files in gallery.', 1],
'Sauce': [true, 'Add sauce links to images.'],
@ -294,7 +294,7 @@ Config = (function() {
'IP Count in Stats': [true, 'Display the unique IP count in the thread stats.', 1],
'Page Count in Stats': [true, 'Display the page count in the thread stats.', 1],
'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'],
'Thread Watcher': [true, 'Bookmark threads.'],
'Thread Watcher': [true, 'Bookmark threads. Has more options in the thread watcher menu.'],
'Fixed Thread Watcher': [true, 'Makes the thread watcher scroll with the page.', 1],
'Persistent Thread Watcher': [false, 'The thread watcher will be visible when the page is loaded.', 1],
'Mark New IPs': [false, 'Label each post from a new IP with the thread\'s current IP count.'],
@ -364,7 +364,8 @@ Config = (function() {
'Auto Watch': [true, 'Automatically watch threads you start.'],
'Auto Watch Reply': [true, 'Automatically watch threads you reply to.'],
'Auto Prune': [false, 'Automatically remove dead threads.'],
'Show Unread Count': [true, 'Show number of unread posts in watched threads.']
'Show Unread Count': [true, 'Show number of unread posts in watched threads.'],
'Require OP Quote Link': [false, 'For purposes of thread watcher highlighting, only consider posts with a quote link to the OP as replies to the OP.']
},
filter: {
postID: "# Highlight dubs on [s4s]:\n#/(\\d)\\1$/;highlight;top:no;boards:s4s",
@ -11270,6 +11271,9 @@ Settings = (function() {
}
addSauces(Config['sauces'].match(/# Known filename formats:(?:\n.+)*|$/)[0].split('\n'));
}
if (compareString < '00001.00013.00007.00002') {
setD('Require OP Quote Link', true);
}
return changes;
},
loadSettings: function(data, cb) {
@ -18977,7 +18981,7 @@ ThreadWatcher = (function() {
continue;
}
unread++;
if (!quotingYou && youOP && !Filter.isHidden(Build.parseJSON(postObj, boardID))) {
if (!quotingYou && !Conf['Require OP Quote Link'] && youOP && !Filter.isHidden(Build.parseJSON(postObj, boardID))) {
quotingYou = true;
continue;
}
@ -19678,7 +19682,7 @@ Unread = (function() {
return ThreadWatcher.update(Unread.thread.board.ID, Unread.thread.ID, {
isDead: Unread.thread.isDead,
unread: Unread.posts.size,
quotingYou: !!(QuoteYou.isYou(Unread.thread.OP) ? Unread.posts.size : Unread.postsQuotingYou.size)
quotingYou: !!(!Conf['Require OP Quote Link'] && QuoteYou.isYou(Unread.thread.OP) ? Unread.posts.size : Unread.postsQuotingYou.size)
});
}
})

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

18
builds/4chan-X-noupdate.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.13.7.1
// @version 1.13.7.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -151,7 +151,7 @@ docSet = function() {
};
g = {
VERSION: '1.13.7.1',
VERSION: '1.13.7.2',
NAMESPACE: '4chan X.',
boards: {}
};
@ -247,7 +247,7 @@ Config = (function() {
'Image Expansion': [true, 'Expand images / videos.'],
'Image Hover': [true, 'Show full image / video on mouseover.'],
'Image Hover in Catalog': [true, 'Show full image / video on mouseover in 4chan X catalog.'],
'Gallery': [true, 'Adds a simple and cute image gallery.'],
'Gallery': [true, 'Adds a simple and cute image gallery. Has more options in the gallery menu.'],
'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1],
'PDF in Gallery': [false, 'Show PDF files in gallery.', 1],
'Sauce': [true, 'Add sauce links to images.'],
@ -294,7 +294,7 @@ Config = (function() {
'IP Count in Stats': [true, 'Display the unique IP count in the thread stats.', 1],
'Page Count in Stats': [true, 'Display the page count in the thread stats.', 1],
'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'],
'Thread Watcher': [true, 'Bookmark threads.'],
'Thread Watcher': [true, 'Bookmark threads. Has more options in the thread watcher menu.'],
'Fixed Thread Watcher': [true, 'Makes the thread watcher scroll with the page.', 1],
'Persistent Thread Watcher': [false, 'The thread watcher will be visible when the page is loaded.', 1],
'Mark New IPs': [false, 'Label each post from a new IP with the thread\'s current IP count.'],
@ -364,7 +364,8 @@ Config = (function() {
'Auto Watch': [true, 'Automatically watch threads you start.'],
'Auto Watch Reply': [true, 'Automatically watch threads you reply to.'],
'Auto Prune': [false, 'Automatically remove dead threads.'],
'Show Unread Count': [true, 'Show number of unread posts in watched threads.']
'Show Unread Count': [true, 'Show number of unread posts in watched threads.'],
'Require OP Quote Link': [false, 'For purposes of thread watcher highlighting, only consider posts with a quote link to the OP as replies to the OP.']
},
filter: {
postID: "# Highlight dubs on [s4s]:\n#/(\\d)\\1$/;highlight;top:no;boards:s4s",
@ -11270,6 +11271,9 @@ Settings = (function() {
}
addSauces(Config['sauces'].match(/# Known filename formats:(?:\n.+)*|$/)[0].split('\n'));
}
if (compareString < '00001.00013.00007.00002') {
setD('Require OP Quote Link', true);
}
return changes;
},
loadSettings: function(data, cb) {
@ -18977,7 +18981,7 @@ ThreadWatcher = (function() {
continue;
}
unread++;
if (!quotingYou && youOP && !Filter.isHidden(Build.parseJSON(postObj, boardID))) {
if (!quotingYou && !Conf['Require OP Quote Link'] && youOP && !Filter.isHidden(Build.parseJSON(postObj, boardID))) {
quotingYou = true;
continue;
}
@ -19678,7 +19682,7 @@ Unread = (function() {
return ThreadWatcher.update(Unread.thread.board.ID, Unread.thread.ID, {
isDead: Unread.thread.isDead,
unread: Unread.posts.size,
quotingYou: !!(QuoteYou.isYou(Unread.thread.OP) ? Unread.posts.size : Unread.postsQuotingYou.size)
quotingYou: !!(!Conf['Require OP Quote Link'] && QuoteYou.isYou(Unread.thread.OP) ? Unread.posts.size : Unread.postsQuotingYou.size)
});
}
})

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.13.7.1
// @version 1.13.7.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

18
builds/4chan-X.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.13.7.1
// @version 1.13.7.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -151,7 +151,7 @@ docSet = function() {
};
g = {
VERSION: '1.13.7.1',
VERSION: '1.13.7.2',
NAMESPACE: '4chan X.',
boards: {}
};
@ -247,7 +247,7 @@ Config = (function() {
'Image Expansion': [true, 'Expand images / videos.'],
'Image Hover': [true, 'Show full image / video on mouseover.'],
'Image Hover in Catalog': [true, 'Show full image / video on mouseover in 4chan X catalog.'],
'Gallery': [true, 'Adds a simple and cute image gallery.'],
'Gallery': [true, 'Adds a simple and cute image gallery. Has more options in the gallery menu.'],
'Fullscreen Gallery': [false, 'Open gallery in fullscreen mode.', 1],
'PDF in Gallery': [false, 'Show PDF files in gallery.', 1],
'Sauce': [true, 'Add sauce links to images.'],
@ -294,7 +294,7 @@ Config = (function() {
'IP Count in Stats': [true, 'Display the unique IP count in the thread stats.', 1],
'Page Count in Stats': [true, 'Display the page count in the thread stats.', 1],
'Updater and Stats in Header': [true, 'Places the thread updater and thread stats in the header instead of floating them.'],
'Thread Watcher': [true, 'Bookmark threads.'],
'Thread Watcher': [true, 'Bookmark threads. Has more options in the thread watcher menu.'],
'Fixed Thread Watcher': [true, 'Makes the thread watcher scroll with the page.', 1],
'Persistent Thread Watcher': [false, 'The thread watcher will be visible when the page is loaded.', 1],
'Mark New IPs': [false, 'Label each post from a new IP with the thread\'s current IP count.'],
@ -364,7 +364,8 @@ Config = (function() {
'Auto Watch': [true, 'Automatically watch threads you start.'],
'Auto Watch Reply': [true, 'Automatically watch threads you reply to.'],
'Auto Prune': [false, 'Automatically remove dead threads.'],
'Show Unread Count': [true, 'Show number of unread posts in watched threads.']
'Show Unread Count': [true, 'Show number of unread posts in watched threads.'],
'Require OP Quote Link': [false, 'For purposes of thread watcher highlighting, only consider posts with a quote link to the OP as replies to the OP.']
},
filter: {
postID: "# Highlight dubs on [s4s]:\n#/(\\d)\\1$/;highlight;top:no;boards:s4s",
@ -11270,6 +11271,9 @@ Settings = (function() {
}
addSauces(Config['sauces'].match(/# Known filename formats:(?:\n.+)*|$/)[0].split('\n'));
}
if (compareString < '00001.00013.00007.00002') {
setD('Require OP Quote Link', true);
}
return changes;
},
loadSettings: function(data, cb) {
@ -18977,7 +18981,7 @@ ThreadWatcher = (function() {
continue;
}
unread++;
if (!quotingYou && youOP && !Filter.isHidden(Build.parseJSON(postObj, boardID))) {
if (!quotingYou && !Conf['Require OP Quote Link'] && youOP && !Filter.isHidden(Build.parseJSON(postObj, boardID))) {
quotingYou = true;
continue;
}
@ -19678,7 +19682,7 @@ Unread = (function() {
return ThreadWatcher.update(Unread.thread.board.ID, Unread.thread.ID, {
isDead: Unread.thread.isDead,
unread: Unread.posts.size,
quotingYou: !!(QuoteYou.isYou(Unread.thread.OP) ? Unread.posts.size : Unread.postsQuotingYou.size)
quotingYou: !!(!Conf['Require OP Quote Link'] && QuoteYou.isYou(Unread.thread.OP) ? Unread.posts.size : Unread.postsQuotingYou.size)
});
}
})

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.7.1' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.7.2' />
</app>
</gupdate>

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.7.1' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.7.2' />
</app>
</gupdate>

2
src/General/Settings.coffee
View File

@ -414,6 +414,8 @@ Settings =
if data['sauces']?
set 'sauces', data['sauces'].replace(/^(#?\s*)http:\/\/regex\.info\/exif\.cgi/mg, '$1http://exif.regex.info/exif.cgi')
addSauces Config['sauces'].match(/# Known filename formats:(?:\n.+)*|$/)[0].split('\n')
if compareString < '00001.00013.00007.00002'
setD 'Require OP Quote Link', true
changes
loadSettings: (data, cb) ->

2
src/Monitoring/ThreadWatcher.coffee
View File

@ -248,7 +248,7 @@ ThreadWatcher =
unread++
if !quotingYou and youOP and not Filter.isHidden(Build.parseJSON postObj, boardID)
if !quotingYou and !Conf['Require OP Quote Link'] and youOP and not Filter.isHidden(Build.parseJSON postObj, boardID)
quotingYou = true
continue

2
src/Monitoring/Unread.coffee
View File

@ -238,4 +238,4 @@ Unread =
ThreadWatcher.update Unread.thread.board.ID, Unread.thread.ID,
isDead: Unread.thread.isDead
unread: Unread.posts.size
quotingYou: !!(if QuoteYou.isYou(Unread.thread.OP) then Unread.posts.size else Unread.postsQuotingYou.size)
quotingYou: !!(if !Conf['Require OP Quote Link'] and QuoteYou.isYou(Unread.thread.OP) then Unread.posts.size else Unread.postsQuotingYou.size)

8
src/config/Config.coffee
View File

@ -207,7 +207,7 @@ Config =
]
'Gallery': [
true
'Adds a simple and cute image gallery.'
'Adds a simple and cute image gallery. Has more options in the gallery menu.'
]
'Fullscreen Gallery': [
false
@ -398,7 +398,7 @@ Config =
]
'Thread Watcher': [
true
'Bookmark threads.'
'Bookmark threads. Has more options in the thread watcher menu.'
]
'Fixed Thread Watcher': [
true
@ -661,6 +661,10 @@ Config =
true
'Show number of unread posts in watched threads.'
]
'Require OP Quote Link': [
false
'For purposes of thread watcher highlighting, only consider posts with a quote link to the OP as replies to the OP.'
]
filter:
postID: """

4
version.json
View File

@ -1,4 +1,4 @@
{
"version": "1.13.7.1",
"date": "2017-02-02T13:29:52.847Z"
"version": "1.13.7.2",
"date": "2017-02-06T08:39:20.054Z"
}