Skip to content

タイトルのサニタイズ処理をオプション化 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EarlgreyPicard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

タイトルのサニタイズ処理をオプション化 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chrome/content/foxage2ch/findThread.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var FindThread = {
key: RegExp.$1,
created: parseInt(RegExp.$1, 10) * 1000 * 1000,
lastRes: parseInt(RegExp.$3, 10),
title: FoxAge2chUtils.unescapeEntities(FoxAge2chUtils.sanitizeTitle(RegExp.$2))
title: FoxAge2chUtils.sanitizeTitle(FoxAge2chUtils.unescapeEntities(RegExp.$2))
});
}, this);
this.owner.wizard.canAdvance = true;
Expand Down
3 changes: 1 addition & 2 deletions chrome/content/foxage2ch/import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,7 @@ var ImportProcessor = {
var type = this._getProperty(res, "type");
var title = this._getProperty(res, "title");
var status = this._getProperty(res, "status");
title = FoxAge2chUtils.unescapeEntities(title);
title = FoxAge2chUtils.sanitizeTitle(title);
title = FoxAge2chUtils.sanitizeTitle(FoxAge2chUtils.unescapeEntities(title));
var flags = 0;
if (status.indexOf("checking") >= 0)
flags |= FoxAge2chUtils.STATUS_CHECKING;
Expand Down
6 changes: 2 additions & 4 deletions components/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,8 +736,7 @@ FoxAge2chService.prototype = {
? /<h1>([^<]+)<\/h1>/i : /<title>([^<]+)<\/title>/i;
if (pattern.test(aResponseText)) {
var title = RegExp.$1;
title = FoxAge2chUtils.unescapeEntities(title);
title = FoxAge2chUtils.sanitizeTitle(title);
title = FoxAge2chUtils.sanitizeTitle(FoxAge2chUtils.unescapeEntities(title));
if (item.type == FoxAge2chUtils.TYPE_BOARD)
// 「＠2ch掲示板」「＠bbspink掲示板」などをカット
title = title.replace(/\uFF20.+$/, "");
Expand Down Expand Up @@ -787,8 +786,7 @@ FoxAge2chService.prototype = {
var pattern = new RegExp(dat + "\\.(?:dat<>|cgi,)(.+)\\s*\\(\\d+\\)");
if (pattern.test(aResponseText)) {
var title = RegExp.$1;
title = FoxAge2chUtils.unescapeEntities(title);
title = FoxAge2chUtils.sanitizeTitle(title);
title = FoxAge2chUtils.sanitizeTitle(FoxAge2chUtils.unescapeEntities(title));
FoxAge2chUtils.service.changeItemProperty(item, "title", title);
FoxAge2chUtils.rebuildTree(item.id);
FoxAge2chUtils.showMessage(FoxAge2chUtils.getLocaleString("SUCCESS"));
Expand Down
2 changes: 2 additions & 0 deletions defaults/preferences/foxage2ch-prefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ pref("extensions.foxage2ch.loadInterval", 3);
pref("extensions.foxage2ch.dataDir.default", true);
pref("extensions.foxage2ch.dataDir.path", "");
pref("extensions.foxage2ch.maxBackups", 5);
pref("extensions.foxage2ch.removeAutoAddedWords", true);
pref("extensions.foxage2ch.removeDecorations", true);
17 changes: 9 additions & 8 deletions modules/utils.jsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,24 +438,25 @@ var FoxAge2chUtils = {
};
},

// 「&」「<」「>」「"」の実体参照をデコードする
// 「&」「<」「>」「"」「©」の文字参照をデコードする
unescapeEntities: function F2U_unescapeEntities(aString) {
aString = aString.replace(/&amp;/g, '&');
aString = aString.replace(/&lt;/g, '<');
aString = aString.replace(/&gt;/g, '>');
aString = aString.replace(/&quot;/g, '"');
aString = aString.replace(/&copy;|&#169;/g, '\u00A9');
return aString;
},

// タイトルの余計な文字列を削除する
sanitizeTitle: function F2U_sanitizeTitle(aTitle) {
aTitle = aTitle.replace("[\u8EE2\u8F09\u7981\u6B62]", "", "g"); // [転載禁止]
aTitle = aTitle.replace("[\u7121\u65AD\u8EE2\u8F09\u7981\u6B62]", "", "g"); // [無断転載禁止]
aTitle = aTitle.replace("&copy;2ch.net", "", "g"); // ©2ch.net
aTitle = aTitle.replace("&#169;2ch.net", "", "g"); // ©2ch.net
aTitle = aTitle.replace("&copy;bbspink.com", "", "g"); // ©bbspink.com
aTitle = aTitle.replace("&#169;bbspink.com", "", "g"); // @bbspink.com
aTitle = aTitle.replace(/\u25A0|\u25C6|\u25CF|\u2605|\u2606/g, " "); // ■,◆,●,★,☆
if (FoxAge2chUtils.prefs.getBoolPref("removeAutoAddedWords")) {
aTitle = aTitle.replace(/\[(?:\u7121\u65AD)?\u8EE2\u8F09\u7981\u6B62\]/g, ""); // [無断転載禁止],[転載禁止]
aTitle = aTitle.replace(/\u00A9(?:2ch\.net|bbspink\.com)/g, ""); // ©2ch.net,©bbspink.com
}
if (FoxAge2chUtils.prefs.getBoolPref("removeDecorations")) {
aTitle = aTitle.replace(/\u25A0|\u25A1|\u25C6|\u25C7|\u25CF|\u25CB|\u2605|\u2606|\u25B2|\u25B3|\u25BC|\u25BD/g, " "); // ■,□,◆,◇,●,○,★,☆,▲,△,▼,▽
}
aTitle = aTitle.replace(/[\u0000-\u001F]/g, ""); // 制御文字
aTitle = aTitle.replace(/\s+/g, " "); // 連続する空白
aTitle = aTitle.replace(/^\s+|\s+$/g, ""); // 先頭・末尾の空白
Expand Down