diff --git a/app/.eslintignore b/app/.eslintignore
new file mode 100644
index 00000000..32f095ab
--- /dev/null
+++ b/app/.eslintignore
@@ -0,0 +1,5 @@
+js/common/blurhash.js
+js/common/hammer.min.js
+js/common/sha256.js
+js/platform/punycode.js
+js/platform/tj-deck.js
\ No newline at end of file
diff --git a/app/.eslintrc.json b/app/.eslintrc.json
new file mode 100644
index 00000000..0cb1a0f1
--- /dev/null
+++ b/app/.eslintrc.json
@@ -0,0 +1,14 @@
+{
+ "extends": "eslint:recommended",
+ "env": {"browser": true},
+ "rules": {
+ "no-console": "off",
+ "semi": ["error", "never"]
+ },
+ "globals": {
+ "$": false,
+ "ver": true,
+ "pwa": true,
+ "lang": true
+ }
+}
\ No newline at end of file
diff --git a/app/js/common/modal.js b/app/js/common/modal.js
index bebc7dcb..d45b3478 100644
--- a/app/js/common/modal.js
+++ b/app/js/common/modal.js
@@ -10,7 +10,7 @@ $(document).ready(function () {
belowOrigin: false, // Displays dropdown below the button
alignment: 'left', // Displays dropdown with edge aligned to the left of button
stopPropagation: false
- });
+ })
$('.dropdown-trigger').dropdown({
inDuration: 300,
outDuration: 225,
@@ -21,9 +21,9 @@ $(document).ready(function () {
alignment: 'left', // Displays dropdown with edge aligned to the left of button
stopPropagation: false // Stops event propagation
}
- );
- $('.collapsible').collapsible();
+ )
+ $('.collapsible').collapsible()
$('#videomodal').modal({
onCloseEnd: stopVideo
- });
-});
\ No newline at end of file
+ })
+})
\ No newline at end of file
diff --git a/app/js/common/time.js b/app/js/common/time.js
index 2516e6e3..fa72e335 100644
--- a/app/js/common/time.js
+++ b/app/js/common/time.js
@@ -17,26 +17,26 @@
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
- define(['jquery'], factory);
+ define(['jquery'], factory)
} else if (typeof module === 'object' && typeof module.exports === 'object') {
- factory(require('jquery'));
+ factory(require('jquery'))
} else {
// Browser globals
- factory(jQuery);
+ factory(jQuery)
}
}(function ($) {
$.timeago = function (timestamp) {
if (timestamp instanceof Date) {
- return inWords(timestamp);
+ return inWords(timestamp)
} else if (typeof timestamp === "string") {
- return inWords($.timeago.parse(timestamp));
+ return inWords($.timeago.parse(timestamp))
} else if (typeof timestamp === "number") {
- return inWords(new Date(timestamp));
+ return inWords(new Date(timestamp))
} else {
- return inWords($.timeago.datetime(timestamp));
+ return inWords($.timeago.datetime(timestamp))
}
- };
- var $t = $.timeago;
+ }
+ var $t = $.timeago
$.extend($.timeago, {
settings: {
refreshMillis: 60000,
@@ -69,33 +69,33 @@
inWords: function (distanceMillis) {
if (!this.settings.allowPast && !this.settings.allowFuture) {
- throw 'timeago allowPast and allowFuture settings can not both be set to false.';
+ throw 'timeago allowPast and allowFuture settings can not both be set to false.'
}
- var $l = this.settings.strings;
- var prefix = $l.prefixAgo;
- var suffix = $l.suffixAgo;
+ var $l = this.settings.strings
+ var prefix = $l.prefixAgo
+ var suffix = $l.suffixAgo
if (this.settings.allowFuture) {
if (distanceMillis < 0) {
- prefix = $l.prefixFromNow;
- suffix = $l.suffixFromNow;
+ prefix = $l.prefixFromNow
+ suffix = $l.suffixFromNow
}
}
if (!this.settings.allowPast && distanceMillis >= 0) {
- return this.settings.strings.inPast;
+ return this.settings.strings.inPast
}
- var seconds = Math.abs(distanceMillis) / 1000;
- var minutes = seconds / 60;
- var hours = minutes / 60;
- var days = hours / 24;
- var years = days / 365;
+ var seconds = Math.abs(distanceMillis) / 1000
+ var minutes = seconds / 60
+ var hours = minutes / 60
+ var days = hours / 24
+ var years = days / 365
function substitute(stringOrFunction, number) {
- var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
- var value = ($l.numbers && $l.numbers[number]) || number;
- return string.replace(/%d/i, value);
+ var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction
+ var value = ($l.numbers && $l.numbers[number]) || number
+ return string.replace(/%d/i, value)
}
var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
@@ -108,124 +108,124 @@
days < 45 && substitute($l.month, 1) ||
days < 365 && substitute($l.months, Math.round(days / 30)) ||
years < 1.5 && substitute($l.year, 1) ||
- substitute($l.years, Math.round(years));
+ substitute($l.years, Math.round(years))
- var separator = $l.wordSeparator || "";
- if ($l.wordSeparator === undefined) { separator = " "; }
- return $.trim([prefix, words, suffix].join(separator));
+ var separator = $l.wordSeparator || ""
+ if ($l.wordSeparator === undefined) { separator = " " }
+ return $.trim([prefix, words, suffix].join(separator))
},
parse: function (iso8601) {
- var s = $.trim(iso8601);
- s = s.replace(/\.\d+/, ""); // remove milliseconds
- s = s.replace(/-/, "/").replace(/-/, "/");
- s = s.replace(/T/, " ").replace(/Z/, " UTC");
- s = s.replace(/([\+\-]\d\d)\:?(\d\d)/, " $1$2"); // -04:00 -> -0400
- s = s.replace(/([\+\-]\d\d)$/, " $100"); // +09 -> +0900
- return new Date(s);
+ var s = $.trim(iso8601)
+ s = s.replace(/\.\d+/, "") // remove milliseconds
+ s = s.replace(/-/, "/").replace(/-/, "/")
+ s = s.replace(/T/, " ").replace(/Z/, " UTC")
+ s = s.replace(/([\+\-]\d\d)\:?(\d\d)/, " $1$2") // -04:00 -> -0400
+ s = s.replace(/([\+\-]\d\d)$/, " $100") // +09 -> +0900
+ return new Date(s)
},
datetime: function (elem) {
- var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
- return $t.parse(iso8601);
+ var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title")
+ return $t.parse(iso8601)
},
isTime: function (elem) {
// jQuery's `is()` doesn't play well with HTML5 in IE
- return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+ return $(elem).get(0).tagName.toLowerCase() === "time" // $(elem).is("time");
}
- });
+ })
// functions that can be called via $(el).timeago('action')
// init is default when no action is given
// functions are called with context of a single element
var functions = {
init: function () {
- functions.dispose.call(this);
- var refresh_el = $.proxy(refresh, this);
- refresh_el();
- var $s = $t.settings;
+ functions.dispose.call(this)
+ var refresh_el = $.proxy(refresh, this)
+ refresh_el()
+ var $s = $t.settings
if ($s.refreshMillis > 0) {
- this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
+ this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis)
}
},
update: function (timestamp) {
- var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
- $(this).data('timeago', { datetime: date });
+ var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp)
+ $(this).data('timeago', { datetime: date })
if ($t.settings.localeTitle) {
- $(this).attr("title", date.toLocaleString());
+ $(this).attr("title", date.toLocaleString())
}
- refresh.apply(this);
+ refresh.apply(this)
},
updateFromDOM: function () {
- $(this).data('timeago', { datetime: $t.parse($t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title")) });
- refresh.apply(this);
+ $(this).data('timeago', { datetime: $t.parse($t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title")) })
+ refresh.apply(this)
},
dispose: function () {
if (this._timeagoInterval) {
- window.clearInterval(this._timeagoInterval);
- this._timeagoInterval = null;
+ window.clearInterval(this._timeagoInterval)
+ this._timeagoInterval = null
}
}
- };
+ }
$.fn.timeago = function (action, options) {
- var fn = action ? functions[action] : functions.init;
+ var fn = action ? functions[action] : functions.init
if (!fn) {
- throw new Error("Unknown function name '" + action + "' for timeago");
+ throw new Error("Unknown function name '" + action + "' for timeago")
}
// each over objects here and call the requested function
this.each(function () {
- fn.call(this, options);
- });
- return this;
- };
+ fn.call(this, options)
+ })
+ return this
+ }
function refresh() {
- var $s = $t.settings;
+ var $s = $t.settings
//check if it's still visible
if ($s.autoDispose && !$.contains(document.documentElement, this)) {
//stop if it has been removed
- $(this).timeago("dispose");
- return this;
+ $(this).timeago("dispose")
+ return this
}
- var data = prepareData(this);
+ var data = prepareData(this)
if (!isNaN(data.datetime)) {
if ($s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
- $(this).text(inWords(data.datetime));
+ $(this).text(inWords(data.datetime))
} else {
if ($(this).attr('title').length > 0) {
- $(this).text($(this).attr('title'));
+ $(this).text($(this).attr('title'))
}
}
}
- return this;
+ return this
}
function prepareData(element) {
- element = $(element);
+ element = $(element)
if (!element.data("timeago")) {
- element.data("timeago", { datetime: $t.datetime(element) });
- var text = $.trim(element.text());
+ element.data("timeago", { datetime: $t.datetime(element) })
+ var text = $.trim(element.text())
if ($t.settings.localeTitle) {
- element.attr("title", element.data('timeago').datetime.toLocaleString());
+ element.attr("title", element.data('timeago').datetime.toLocaleString())
} else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
- element.attr("title", text);
+ element.attr("title", text)
}
}
- return element.data("timeago");
+ return element.data("timeago")
}
function inWords(date) {
- return $t.inWords(distance(date));
+ return $t.inWords(distance(date))
}
function distance(date) {
- return (new Date().getTime() - date.getTime());
+ return (new Date().getTime() - date.getTime())
}
// fix for IE6 suckage
- document.createElement("abbr");
- document.createElement("time");
-}));
\ No newline at end of file
+ document.createElement("abbr")
+ document.createElement("time")
+}))
\ No newline at end of file
diff --git a/app/js/emoji/emojipack.js b/app/js/emoji/emojipack.js
index db0d5646..08c9302e 100644
--- a/app/js/emoji/emojipack.js
+++ b/app/js/emoji/emojipack.js
@@ -92,7 +92,7 @@ var activity=[
{shortcode:"man-rowing-boat",css:"95.8333% 14.5833%"},
{shortcode:"man-biking",css:"95.8333% 39.5833%"},
{shortcode:"man-mountain-biking",css:"95.8333% 64.5833%"}
- ];
+ ]
var flag=[
{shortcode:"checkered_flag",css:"16.6667% 58.3333%"},
{shortcode:"crossed_flags",css:"14.5833% 60.4167%"},
@@ -356,7 +356,7 @@ var flag=[
{shortcode:"rainbow-flag",css:"83.3333% 100%"},
{shortcode:"triangular_flag_on_post",css:"54.1667% 6.25%"},
{shortcode:"waving_black_flag",css:"20.8333% 29.1667%"},
- {shortcode:"waving_white_flag",css:"20.8333% 27.0833%"}];
+ {shortcode:"waving_white_flag",css:"20.8333% 27.0833%"}]
var food=[
{shortcode:"green_apple",css:"12.5% 25%"},
{shortcode:"apple",css:"12.5% 22.9167%"},
@@ -444,7 +444,7 @@ var food=[
{shortcode:"spoon",css:"62.5% 14.5833%"},
{shortcode:"fork_and_knife",css:"14.5833% 0%"},
{shortcode:"knife_fork_plate",css:"14.5833% 18.75%"}
- ];
+ ]
var nature=[
{shortcode:"dog",css:"22.9167% 62.5%"},
{shortcode:"cat",css:"22.9167% 52.0833%"},
@@ -605,7 +605,7 @@ var nature=[
{shortcode:"droplet",css:"35.4167% 39.5833%"},
{shortcode:"sweat_drops",css:"35.4167% 37.5%"},
{shortcode:"umbrella_with_rain_drops",css:"0% 100%"}
- ];
+ ]
var object=[
{shortcode:"watch",css:"0% 29.1667%"},
{shortcode:"iphone",css:"39.5833% 0%"},
@@ -780,7 +780,7 @@ var object=[
{shortcode:"closed_lock_with_key",css:"39.5833% 62.5%"},
{shortcode:"lock",css:"39.5833% 66.6667%"},
{shortcode:"unlock",css:"39.5833% 68.75%"}
- ];
+ ]
var people=[
{shortcode:"grinning",css:"45.8333% 68.75%"},
{shortcode:"smiley",css:"45.8333% 75%"},
@@ -1096,7 +1096,7 @@ var people=[
{shortcode:"woman-raising-hand",css:"93.75% 29.1667%"},
{shortcode:"woman-frowning",css:"93.75% 54.1667%"},
{shortcode:"woman-pouting",css:"93.75% 79.1667%"}
- ];
+ ]
var place=[
{shortcode:"car",css:"52.0833% 60.4167%"},
{shortcode:"taxi",css:"52.0833% 56.25%"},
@@ -1217,7 +1217,7 @@ var place=[
{shortcode:"milky_way",css:"8.33333% 93.75%"},
{shortcode:"bridge_at_night",css:"8.33333% 87.5%"},
{shortcode:"foggy",css:"8.33333% 70.8333%"}
- ];
+ ]
var symbol=[
{shortcode:"heart",css:"6.25% 62.5%"},
{shortcode:"yellow_heart",css:"35.4167% 14.5833%"},
@@ -1492,7 +1492,7 @@ var symbol=[
{shortcode:"female_sign",css:"2.08333% 37.5%"},
{shortcode:"male_sign",css:"2.08333% 39.5833%"},
{shortcode:"staff_of_aesculapius",css:"2.08333% 87.5%"}
-];
+]
var faicons=[
"fa-500px",
"fa-address-book",
diff --git a/app/js/login/instance.js b/app/js/login/instance.js
index 4ac052b7..cfa52881 100644
--- a/app/js/login/instance.js
+++ b/app/js/login/instance.js
@@ -83,6 +83,6 @@ var idata = {
"nitiasa.com_quote":"enabled",
"biwakodon.com_quote":"enabled",
"comm.cx_quote":"enabled"
-};
+}
-localStorage.setItem("instance", JSON.stringify(idata));
+localStorage.setItem("instance", JSON.stringify(idata))
diff --git a/app/js/login/logout.js b/app/js/login/logout.js
index 56b71c23..c2960d6e 100644
--- a/app/js/login/logout.js
+++ b/app/js/login/logout.js
@@ -1,7 +1,7 @@
//ログアウトします
function logout() {
- localStorage.removeItem("acct_" + acct_id + "_at");
- localStorage.removeItem("domain_" + acct_id);
- location.href = "index.html";
- todc();
+ localStorage.removeItem("acct_" + acct_id + "_at")
+ localStorage.removeItem("domain_" + acct_id)
+ location.href = "index.html"
+ todc()
}
\ No newline at end of file
diff --git a/app/js/tl/date.js b/app/js/tl/date.js
index cbc3a329..054aeaba 100644
--- a/app/js/tl/date.js
+++ b/app/js/tl/date.js
@@ -1,95 +1,95 @@
//日付パーサー
function date(str, datetype) {
if (datetype == "relative") {
- return '' + dmListParse(json, type, acct_id, tlid, "", mute) + "
";
- localStorage.setItem("lastobj_" + tlid, json[0].id);
- $("#timeline_" + tlid).html(templete);
- additional(acct_id, tlid);
- jQuery("time.timeago").timeago();
- todc();
+ var templete = '' + dmListParse(json, type, acct_id, tlid, "", mute) + "
"
+ localStorage.setItem("lastobj_" + tlid, json[0].id)
+ $("#timeline_" + tlid).html(templete)
+ additional(acct_id, tlid)
+ jQuery("time.timeago").timeago()
+ todc()
//reload(type, '', acct_id, tlid, data, mute, delc,voice);
- $(window).scrollTop(0);
- });
+ $(window).scrollTop(0)
+ })
}
function dmmore(tlid) {
- var multi = localStorage.getItem("column");
- var obj = JSON.parse(multi);
- var acct_id = obj[tlid].domain;
- var domain = localStorage.getItem("domain_" + acct_id);
- var at = localStorage.getItem("acct_" + acct_id + "_at");
+ var multi = localStorage.getItem("column")
+ var obj = JSON.parse(multi)
+ var acct_id = obj[tlid].domain
+ var domain = localStorage.getItem("domain_" + acct_id)
+ var at = localStorage.getItem("acct_" + acct_id + "_at")
var sid = $("#timeline_" + tlid + " .cvo")
.last()
- .attr("unique-id");
- var start = "https://" + domain + "/api/v1/conversations?max_id=" + sid;
- var type = "dm";
+ .attr("unique-id")
+ var start = "https://" + domain + "/api/v1/conversations?max_id=" + sid
+ var type = "dm"
fetch(start, {
method: "GET",
headers: {
@@ -55,444 +55,444 @@ function dmmore(tlid) {
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
- setLog(response.url, response.status, text);
- });
+ setLog(response.url, response.status, text)
+ })
}
- return response.json();
+ return response.json()
})
.catch(function(error) {
- todo(error);
- setLog(start, "JSON", error);
- console.error(error);
+ todo(error)
+ setLog(start, "JSON", error)
+ console.error(error)
})
.then(function(json) {
- var templete = '' + dmListParse(json, type, acct_id, tlid, "", mute) + "
";
- $("#timeline_" + tlid).append(templete);
- additional(acct_id, tlid);
- jQuery("time.timeago").timeago();
- moreloading = false;
- });
+ var templete = '' + dmListParse(json, type, acct_id, tlid, "", mute) + "
"
+ $("#timeline_" + tlid).append(templete)
+ additional(acct_id, tlid)
+ jQuery("time.timeago").timeago()
+ moreloading = false
+ })
}
//DMオブジェクトパーサー(トゥート)
function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
- var templete = "";
+ var templete = ""
if (obj[0]) {
- localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, "unix"));
+ localStorage.setItem("lastunix_" + tlid, date(obj[0].created_at, "unix"))
}
- var actb = localStorage.getItem("action_btns");
- var actb = "re,rt,fav,qt,del,pin,red";
+ var actb = localStorage.getItem("action_btns")
+ var actb = "re,rt,fav,qt,del,pin,red"
if (actb) {
- var actb = actb.split(",");
- var disp = {};
+ var actb = actb.split(",")
+ var disp = {}
for (var k = 0; k < actb.length; k++) {
if (k < 4) {
- var tp = "type-a";
+ var tp = "type-a"
} else {
- var tp = "type-b";
+ var tp = "type-b"
}
- disp[actb[k]] = tp;
+ disp[actb[k]] = tp
}
}
- var datetype = localStorage.getItem("datetype");
- var nsfwtype = localStorage.getItem("nsfw");
- var sent = localStorage.getItem("sentence");
- var ltr = localStorage.getItem("letters");
- var gif = localStorage.getItem("gif");
- var imh = localStorage.getItem("img-height");
+ var datetype = localStorage.getItem("datetype")
+ var nsfwtype = localStorage.getItem("nsfw")
+ var sent = localStorage.getItem("sentence")
+ var ltr = localStorage.getItem("letters")
+ var gif = localStorage.getItem("gif")
+ var imh = localStorage.getItem("img-height")
//独自ロケール
- var locale = localStorage.getItem("locale");
+ var locale = localStorage.getItem("locale")
if (locale == "yes") {
- var locale = false;
+ var locale = false
}
//ネイティブ通知
- var native = localStorage.getItem("nativenotf");
+ var native = localStorage.getItem("nativenotf")
if (!native) {
- native = "yes";
+ native = "yes"
}
//クライアント強調
- var emp = localStorage.getItem("client_emp");
+ var emp = localStorage.getItem("client_emp")
if (emp) {
- var emp = JSON.parse(emp);
+ var emp = JSON.parse(emp)
}
//クライアントミュート
- var mute = localStorage.getItem("client_mute");
+ var mute = localStorage.getItem("client_mute")
if (mute) {
- var mute = JSON.parse(mute);
+ var mute = JSON.parse(mute)
}
//ユーザー強調
- var useremp = localStorage.getItem("user_emp");
+ var useremp = localStorage.getItem("user_emp")
if (useremp) {
- var useremp = JSON.parse(useremp);
+ var useremp = JSON.parse(useremp)
}
//ワード強調
- var wordemp = localStorage.getItem("word_emp");
+ var wordemp = localStorage.getItem("word_emp")
if (wordemp) {
- var wordemp = JSON.parse(wordemp);
+ var wordemp = JSON.parse(wordemp)
}
//ワードミュート
- var wordmute = localStorage.getItem("word_mute");
+ var wordmute = localStorage.getItem("word_mute")
if (wordmute) {
- var wordmute = JSON.parse(wordmute);
- wordmute = wordmute.concat(mutefilter);
+ var wordmute = JSON.parse(wordmute)
+ wordmute = wordmute.concat(mutefilter)
} else {
- wordmute = mutefilter;
+ wordmute = mutefilter
}
//Ticker
- var tickerck = localStorage.getItem("ticker_ok");
+ var tickerck = localStorage.getItem("ticker_ok")
if (tickerck) {
- var ticker = true;
+ var ticker = true
} else {
- var ticker = false;
+ var ticker = false
}
//Cards
- var card = localStorage.getItem("card_" + tlid);
+ var card = localStorage.getItem("card_" + tlid)
if (!sent) {
- var sent = 500;
+ var sent = 500
}
if (!ltr) {
- var ltr = 500;
+ var ltr = 500
}
if (!nsfwtype || nsfwtype == "yes") {
- var nsfw = "ok";
+ var nsfw = "ok"
} else {
- var nsfw;
+ var nsfw
}
- var cwtype = localStorage.getItem("cw");
+ var cwtype = localStorage.getItem("cw")
if (!cwtype || cwtype == "yes") {
- var cw = "ok";
+ var cw = "ok"
} else {
- var cw;
+ var cw
}
if (!datetype) {
- datetype = "absolute";
+ datetype = "absolute"
}
if (!gif) {
- var gif = "yes";
+ var gif = "yes"
}
if (!imh) {
- var imh = "200";
+ var imh = "200"
}
if (!emp) {
- var emp = [];
+ var emp = []
}
if (!mute) {
- var mute = [];
+ var mute = []
}
if (!useremp) {
- var useremp = [];
+ var useremp = []
}
if (!wordemp) {
- var wordemp = [];
+ var wordemp = []
}
if (!wordmute) {
- var wordmute = [];
+ var wordmute = []
}
//via通知
- var viashow = localStorage.getItem("viashow");
+ var viashow = localStorage.getItem("viashow")
if (!viashow) {
- viashow = "via-hide";
+ viashow = "via-hide"
}
if (viashow == "hide") {
- viashow = "via-hide";
+ viashow = "via-hide"
}
//認証なしTL
if (mix == "noauth") {
- var noauth = "hide";
- var antinoauth = "";
+ var noauth = "hide"
+ var antinoauth = ""
} else {
- var noauth = "";
- var antinoauth = "hide";
+ var noauth = ""
+ var antinoauth = "hide"
}
//マウスオーバーのみ
- var mouseover = localStorage.getItem("mouseover");
+ var mouseover = localStorage.getItem("mouseover")
if (!mouseover) {
- mouseover = "";
+ mouseover = ""
} else if (mouseover == "yes" || mouseover == "click") {
- mouseover = "hide";
+ mouseover = "hide"
} else if (mouseover == "no") {
- mouseover = "";
+ mouseover = ""
}
- var local = [];
- var times = [];
+ var local = []
+ var times = []
Object.keys(obj).forEach(function(key) {
- var conv_id = obj[key].id;
- var toot = obj[key].last_status;
- var dis_name = escapeHTML(toot.account.display_name);
+ var conv_id = obj[key].id
+ var toot = obj[key].last_status
+ var dis_name = escapeHTML(toot.account.display_name)
if (toot.account.emojis) {
- var actemojick = toot.account.emojis[0];
+ var actemojick = toot.account.emojis[0]
} else {
- var actemojick = false;
+ var actemojick = false
}
//絵文字があれば
if (actemojick) {
Object.keys(toot.account.emojis).forEach(function(key5) {
- var emoji = toot.account.emojis[key5];
- var shortcode = emoji.shortcode;
- var emoji_url = '' + lang.lang_parse_cwshow + " ' + lang.lang_parse_cwshow + " ' + lang.lang_parse_fulltext + " ' + $.mb_substr($.strip_tags(toot.content), 0, 100) + ' ' + lang.lang_parse_autofold + " ";
- var spoiler = "cw cw_hide_" + toot.id;
- var spoiler_show = '' + lang.lang_parse_more + " ' + lang.lang_parse_fulltext + " ' + $.mb_substr($.strip_tags(toot.content), 0, 100) + ' ' + lang.lang_parse_autofold + " "
+ var spoiler = "cw cw_hide_" + toot.id
+ var spoiler_show = '' + lang.lang_parse_more + " ' + lang.lang_parse_url + " ' + lang.lang_parse_url + " @' + mention.acct + " ";
- });
- mentions = '' + mentions + "
";
+ var mention = toot.mentions[key3]
+ mentions = mentions + "@' + mention.acct + " "
+ })
+ mentions = '' + mentions + "
"
}
- var tagck = toot.tags[0];
- var tags = "";
+ var tagck = toot.tags[0]
+ var tags = ""
//タグであれば
if (tagck) {
Object.keys(toot.tags).forEach(function(key4) {
- var tag = toot.tags[key4];
- tags = tags + '#' + tag.name + ":TL Toot ' + "Pin ';
- });
- tags = '' + tags + "
";
+ var tag = toot.tags[key4]
+ tags = tags + '#' + tag.name + ":TL Toot ' + "Pin '
+ })
+ tags = '' + tags + "
"
}
//アニメ再生
if (gif == "yes") {
- var avatar = toot.account.avatar;
+ var avatar = toot.account.avatar
} else {
- var avatar = toot.account.avatar_static;
+ var avatar = toot.account.avatar_static
}
//ワードミュート
if (wordmute) {
Object.keys(wordmute).forEach(function(key8) {
- var worde = wordmute[key8];
+ var worde = wordmute[key8]
if (worde) {
if (worde.tag) {
- var word = worde.tag;
+ var word = worde.tag
} else {
- var word = worde;
+ var word = worde
}
- var regExp = new RegExp(word, "g");
+ var regExp = new RegExp(word, "g")
if ($.strip_tags(content).match(regExp)) {
- boostback = "hide by_filter";
+ boostback = "hide by_filter"
}
}
- });
+ })
}
//ワード強調
if (wordemp) {
Object.keys(wordemp).forEach(function(key9) {
- var word = wordemp[key9];
+ var word = wordemp[key9]
if (word) {
- var word = word.tag;
- var regExp = new RegExp(word, "g");
- content = content.replace(regExp, '' + escapeHTML(word) + " ");
+ var word = word.tag
+ var regExp = new RegExp(word, "g")
+ content = content.replace(regExp, '' + escapeHTML(word) + " ")
}
- });
+ })
}
//日本語じゃない
if (toot.language != "ja") {
- var trans = '';
+ var trans = ''
} else {
- var trans = "";
+ var trans = ""
}
if (toot.favourited) {
- var if_fav = " yellow-text";
- var fav_app = "faved";
+ var if_fav = " yellow-text"
+ var fav_app = "faved"
} else {
- var if_fav = "";
- var fav_app = "";
+ var if_fav = ""
+ var fav_app = ""
}
//Cards
if (!card && toot.card) {
- var cards = toot.card;
+ var cards = toot.card
if (cards.provider_name == "Twitter") {
if (cards.image) {
- var twiImg = 'URL' + lang.lang_cards_check + ": ";
+ analyze = 'URL' + lang.lang_cards_check + ": "
}
if (cards.html) {
- analyze = cards.html + 'picture_in_picture_alt ';
+ analyze = cards.html + 'picture_in_picture_alt '
}
}
//Ticker
- var tickerdom = "";
+ var tickerdom = ""
if (ticker) {
- var tickerdata = localStorage.getItem("ticker");
+ var tickerdata = localStorage.getItem("ticker")
if (tickerdata) {
- var tickerdata = JSON.parse(tickerdata);
+ var tickerdata = JSON.parse(tickerdata)
- var thisdomain = toot.account.acct.split("@");
+ var thisdomain = toot.account.acct.split("@")
if (thisdomain.length > 1) {
- thisdomain = thisdomain[1];
+ thisdomain = thisdomain[1]
}
for (var i = 0; i < tickerdata.length; i++) {
- var value = tickerdata[i];
+ var value = tickerdata[i]
if (value.domain == thisdomain) {
- var tickerdom = ' ' + escapeHTML(value.name) + " ' + escapeHTML(value.name) + " ' + '
' + notice + home + "
" + '
' + ' ' + noticeavatar + "
" + '
' + dis_name + ' @' + toot.account.acct + locked + "
" + '
" + '
" + '
' + "
' + '
' + notice + home + "
" + '
' + ' ' + noticeavatar + "
" + '
' + dis_name + ' @' + toot.account.acct + locked + "
" + '
" + '
" + '
' + "
' +
' ';
+ '">'
if (toot.type == "reply") {
- var what = lang.lang_parse_mentioned;
- var icon = 'info ';
+ var icon = 'info '
}
var noticetext = '' + dis_name +
"(@" + toot.user.username +
- ") ";
- var notice = noticetext;
- var memory = localStorage.getItem("notice-mem");
+ ")"
+ var notice = noticetext
+ var memory = localStorage.getItem("notice-mem")
if (popup >= 0 && obj.length < 5 && noticetext != memory) {
if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
if (toot.type == "reply") {
var replyct = localStorage.getItem("notf-reply_" + acct_id)
- $(".notf-reply_" + acct_id).text(replyct * 1 - (-1));
+ $(".notf-reply_" + acct_id).text(replyct * 1 - (-1))
localStorage.setItem("notf-reply_" + acct_id, replyct * 1 - (-1))
$(".notf-reply_" + acct_id).removeClass("hide")
} else if (toot.type == "renote" || toot.type == "quote") {
var btct = localStorage.getItem("notf-bt_" + acct_id)
- $(".notf-bt_" + acct_id).text(btct * 1 + 1);
+ $(".notf-bt_" + acct_id).text(btct * 1 + 1)
localStorage.setItem("notf-bt_" + acct_id, btct * 1 - (-1))
$(".notf-bt_" + acct_id).removeClass("hide")
} else if (toot.type == "reaction") {
var favct = localStorage.getItem("notf-fav_" + acct_id)
- $(".notf-fav_" + acct_id).text(favct * 1 - (-1));
+ $(".notf-fav_" + acct_id).text(favct * 1 - (-1))
localStorage.setItem("notf-fav_" + acct_id, favct * 1 - (-1))
$(".notf-fav_" + acct_id).removeClass("hide")
}
}
- var domain = localStorage.getItem("domain_" + acct_id);
+ var domain = localStorage.getItem("domain_" + acct_id)
if (popup > 0) {
M.toast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 })
}
if (native == "yes") {
- var os = localStorage.getItem("platform");
+ var os = localStorage.getItem("platform")
var options = {
body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
icon: toot.user.avatarUrl
- };
- var n = new Notification('TheDesk:' + domain, options);
+ }
+ var n = new Notification('TheDesk:' + domain, options)
}
if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
- $(".notf-icon_" + acct_id).addClass("red-text");
+ $(".notf-icon_" + acct_id).addClass("red-text")
}
- localStorage.setItem("notice-mem", noticetext);
- noticetext = "";
+ localStorage.setItem("notice-mem", noticetext)
+ noticetext = ""
}
- var if_notf = 'data-notfIndv="' + acct_id + "_" + toot.id + '"';
- var toot = toot.note;
- var dis_name = escapeHTML(toot.user.name);
+ var if_notf = 'data-notfIndv="' + acct_id + "_" + toot.id + '"'
+ var toot = toot.note
+ var dis_name = escapeHTML(toot.user.name)
} else {
- var if_notf = "";
+ var if_notf = ""
if (toot.renote) {
- var rebtxt = lang.lang_parse_btedsimple;
- var rticon = "fa-retweet light-blue-text";
+ var rebtxt = lang.lang_parse_btedsimple
+ var rticon = "fa-retweet light-blue-text"
var notice = '
';
+ var divider = '
'
} else {
- var home = "";
- var divider = '
';
+ var home = ""
+ var divider = '
'
}
/*
if (toot.account.locked) {
@@ -332,77 +332,77 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
*/
if (!toot.app) {
if (toot.viaMobile) {
- var via = 'Mobile ';
+ var via = 'Mobile '
} else {
- var via = '';
- viashow = "via-hide";
+ var via = ''
+ viashow = "via-hide"
}
} else {
- var via = escapeHTML(toot.app.name);
+ var via = escapeHTML(toot.app.name)
if (!toot.app.name) {
- viashow = "via-hide";
+ viashow = "via-hide"
}
//強調チェック
Object.keys(empCli).forEach(function (key6) {
- var empCliList = empCli[key6];
+ var empCliList = empCli[key6]
if (empCliList == via) {
- boostback = "emphasized";
+ boostback = "emphasized"
}
- });
+ })
//ミュートチェック
Object.keys(muteCli).forEach(function (key7) {
- var muteCliList = muteCli[key7];
+ var muteCliList = muteCli[key7]
if (muteCliList == via) {
- boostback = "hide";
+ boostback = "hide"
}
- });
+ })
}
if ((toot.cw || toot.cw == "") && cw) {
- var content = escapeHTML(toot.text);
- var spoil = escapeHTMLtemp(toot.cw);
- var spoiler = "cw cw_hide";
- var api_spoil = "gray";
- var spoiler_show = '' + lang.lang_parse_cwshow + ' ' + lang.lang_parse_cwshow + ' ' + lang.lang_parse_fulltext + ' ' + $.mb_substr($.strip_tagstemp(
toot.text), 0, 100) +
- ' ' + lang.lang_parse_autofold + ' ';
- var spoiler = "cw cw_hide";
- var spoiler_show = '' + lang.lang_parse_more + ' ' + lang.lang_parse_autofold + ' '
+ var spoiler = "cw cw_hide"
+ var spoiler_show = '' + lang.lang_parse_more + ' ' + lang.lang_parse_url + ' $1 ')
content = content.replace(/\*\*([^*]+)\*\*/gi, '$1 ')
content = content.replace(/^(.+)\s(検索|search)$/gmi, 'search 検索 検索
')
- content = content.replace(/\[(.+)\]\($1 ');
+ content = content.replace(/\[(.+)\]\($1 ')
content = content.replace(/<center>/gi, '')
content = content.replace(/<\/center>/gi, '
')
content = content.replace(/<flip>(.+)<\/flip>/gi, '$1 ')
@@ -424,58 +424,58 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
content = content.replace(/<spin>(.+)<\/spin>/gi, '$1 ')
content = content.replace(/\*\*(.+)\*\*/gi, '$1 ')
content = content.replace(/<jump>(.+)<\/jump>/gi, '$1')
- content = twemoji.parse(content);
+ content = twemoji.parse(content)
} else {
- content = "";
+ content = ""
}
//絵文字があれば
if (emojick) {
Object.keys(toot.emojis).forEach(function (key5) {
- var emoji = toot.emojis[key5];
- var shortcode = emoji.name;
+ var emoji = toot.emojis[key5]
+ var shortcode = emoji.name
var emoji_url = ' ';
+ ' toot-img pointer" style="max-width:100%;">'
} else if (media.type.indexOf("audio") !== -1) {
viewer = viewer + '';
+ ' toot-img pointer" style="width:100%;" controls>'
} else {
viewer = viewer + '#' + tag + ' #' + tag + ':TL Toot ' +
- 'Pin ';
- content = content.replace("#" + tag, tags);
- });
+ 'Pin '
+ content = content.replace("#" + tag, tags)
+ })
//tags = '' + tags + '
';
}
//公開範囲を取得
- var vis = "";
- var visen = toot.visibility;
+ var vis = ""
+ var visen = toot.visibility
if (visen == "public") {
var vis =
- 'public ';
- var can_rt = "";
+ 'public '
+ var can_rt = ""
} else if (visen == "home") {
var vis =
- 'lock_open ';
- var can_rt = "";
+ 'lock_open '
+ var can_rt = ""
} else if (visen == "followers") {
var vis =
- 'people ';
- var can_rt = "";
+ 'people '
+ var can_rt = ""
} else if (visen == "private") {
var vis =
- 'lock ';
- var can_rt = "";
+ 'lock '
+ var can_rt = ""
} else if (visen == "specified") {
var vis =
- 'mail ';
- var can_rt = "hide";
+ 'mail '
+ var can_rt = "hide"
}
if (toot.user.username == localStorage.getItem("user_" + acct_id)) {
- var if_mine = "";
- var mine_via = "type-b";
+ var if_mine = ""
+ var mine_via = "type-b"
} else {
- var if_mine = "hide";
- var mine_via = "";
+ var if_mine = "hide"
+ var mine_via = ""
}
if (toot.myReaction) {
- var if_fav = " yellow-text";
- var fav_app = "faved";
+ var if_fav = " yellow-text"
+ var fav_app = "faved"
} else {
- var if_fav = "";
- var fav_app = "";
+ var if_fav = ""
+ var fav_app = ""
}
- var if_rt = "";
- var rt_app = "";
+ var if_rt = ""
+ var rt_app = ""
/*
if (toot.reblogged) {
var if_rt = "light-blue-text";
@@ -575,66 +575,66 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
}
*/
//アバター
- var avatar = toot.user.avatarUrl;
+ var avatar = toot.user.avatarUrl
//ワードミュート
if (wordmuteList) {
Object.keys(wordmuteList).forEach(function (key8) {
- var worde = wordmuteList[key8];
+ var worde = wordmuteList[key8]
if (worde) {
if (worde.tag) {
- var wordList = worde.tag;
+ var wordList = worde.tag
} else {
var wordList = worde
}
- var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
+ var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g")
if ($.strip_tagstemp(content).match(regExp)) {
- boostback = "hide by_filter";
+ boostback = "hide by_filter"
}
}
- });
+ })
}
//ワード強調
if (wordempList) {
Object.keys(wordempList).forEach(function (key9) {
- var wordList = wordempList[key9];
+ var wordList = wordempList[key9]
if (wordList) {
- var wordList = wordList.tag;
- var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g");
- content = content.replace(regExp, '' + wordList + " ");
+ var wordList = wordList.tag
+ var regExp = new RegExp(wordList.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&"), "g")
+ content = content.replace(regExp, '' + wordList + " ")
}
- });
+ })
}
//Ticker
- var tickerdom = "";
+ var tickerdom = ""
if (ticker) {
- var tickerdata = JSON.parse(localStorage.getItem("ticker"));
+ var tickerdata = JSON.parse(localStorage.getItem("ticker"))
- var thisdomain = toot.user.username.split("@");
+ var thisdomain = toot.user.username.split("@")
if (thisdomain.length > 1) {
- thisdomain = thisdomain[1];
+ thisdomain = thisdomain[1]
}
for (var i = 0; i < tickerdata.length; i++) {
- var value = tickerdata[i];
+ var value = tickerdata[i]
if (value.domain == thisdomain) {
- var tickerdom = ' ' + escapeHTML(value.name) + ' ' + escapeHTML(value.name) + ' ' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')
';
- });
- poll = '' + poll + '
';
+ poll = poll + '' + escapeHTML(choice.text) + '(' + choice.votes + '' + myvote + ')
'
+ })
+ poll = '' + poll + '
'
}
//引用Renote
if (toot.renote) {
@@ -642,128 +642,128 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
'\',' + acct_id + ');" user="' + toot.renote.user.username + '" class="udg">' + escapeHTML(toot.renote.user.name) + '
' + escapeHTML(toot.renote.text) + '
'
}
if (localStorage.getItem("emojiReaction_" + acct_id) == "disabled") {
- var freeReact = "hide";
+ var freeReact = "hide"
} else {
- var freeReact = "";
+ var freeReact = ""
}
//Reactions
- var addReact = "";
+ var addReact = ""
if (toot.reactions) {
Object.keys(toot.reactions).forEach(function (keye) {
- var thisReact = toot.reactions[keye];
- if (keye == "like") { var defaultEmoji = true; }
- else if (keye == "love") { var defaultEmoji = true; }
- else if (keye == "laugh") { var defaultEmoji = true; }
- else if (keye == "hmm") { var defaultEmoji = true; }
- else if (keye == "surprise") { var defaultEmoji = true; }
- else if (keye == "congrats") { var defaultEmoji = true; }
- else if (keye == "angry") { var defaultEmoji = true; }
- else if (keye == "confused") { var defaultEmoji = true; }
- else if (keye == "star") { var defaultEmoji = true; }
+ var thisReact = toot.reactions[keye]
+ if (keye == "like") { var defaultEmoji = true }
+ else if (keye == "love") { var defaultEmoji = true }
+ else if (keye == "laugh") { var defaultEmoji = true }
+ else if (keye == "hmm") { var defaultEmoji = true }
+ else if (keye == "surprise") { var defaultEmoji = true }
+ else if (keye == "congrats") { var defaultEmoji = true }
+ else if (keye == "angry") { var defaultEmoji = true }
+ else if (keye == "confused") { var defaultEmoji = true }
+ else if (keye == "star") { var defaultEmoji = true }
else {
- var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id));
+ var obj = JSON.parse(localStorage.getItem("emoji_" + acct_id))
if (obj) {
- var num = obj.length;
- var ehtml = "";
+ var num = obj.length
+ var ehtml = ""
for (i = 0; i < num; i++) {
- var emoji = obj[i];
+ var emoji = obj[i]
if (":" + emoji.shortcode + ":" == keye) {
if (emoji) {
addReact = addReact + '' + thisReact +
- ' This post has no content. It may be media-only, private or deleted. ';
+ content = 'This post has no content. It may be media-only, private or deleted. '
}
- var trans = "";
+ var trans = ""
if (toot.user.emojis) {
- var actemojick = toot.user.emojis[0];
+ var actemojick = toot.user.emojis[0]
} else {
- var actemojick = false;
+ var actemojick = false
}
templete = templete + '' +
'' +
- '';
- });
- return templete;
+ ''
+ })
+ return templete
}
//オブジェクトパーサー(ユーザーデータ)
@@ -857,60 +857,60 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
} else {
if (obj.users) {
- var obj = obj.users;
+ var obj = obj.users
}
}
- var templete = '';
- var datetype = localStorage.getItem("datetype");
+ var templete = ''
+ var datetype = localStorage.getItem("datetype")
Object.keys(obj).forEach(function (key) {
- var toot = obj[key];
+ var toot = obj[key]
if (toot.followee) {
toot = toot.followee
} else if (toot.follower) {
toot = toot.follower
}
- var locked = "";
+ var locked = ""
if (auth) {
var auth = 'person_add ';
+ toot.id + '\',\'accept\',' + acct_id + ')">person_add'
} else {
- var auth = "";
+ var auth = ""
}
- var ftxt = lang.lang_parse_followed;
+ var ftxt = lang.lang_parse_followed
if (popup > 0 || popup == -1) {
var notftext = '' + icon(acct.type) + '
' + cap(acct.type, acct.data, acct.domain) + '
' + acctdata + '
cancel ' + acctdata + '
'
+ $("#sort").append(html)
+ })
+ drag()
}
//TLのタイトル
@@ -62,59 +62,59 @@ function Scap(type, data) {
} else if (type == "tootsearch") {
return "tootsearch(" + data + ")"
} else {
- console.error("unknown timeline type: " + type);
+ console.error("unknown timeline type: " + type)
}
}
//jquery-ui依存
function drag() {
- $('#sort').sortable();
- $('#sort').disableSelection();
+ $('#sort').sortable()
+ $('#sort').disableSelection()
}
//ソート指定
function sort() {
- var arr = [];
- var flags = [];
+ var arr = []
+ var flags = []
$(".drag-content").each(function (i, elem) {
- var id = $(this).attr("data-id");
- var flag = $(this).attr("data-flag");
+ var id = $(this).attr("data-id")
+ var flag = $(this).attr("data-flag")
arr.push(id)
- flags.push(flag);
- });
- var col = localStorage.getItem("column");
- var obj = JSON.parse(col);
- var newobj = [];
+ flags.push(flag)
+ })
+ var col = localStorage.getItem("column")
+ var obj = JSON.parse(col)
+ var newobj = []
for (i = 0; i < arr.length; i++) {
- var data = obj[arr[i]];
+ var data = obj[arr[i]]
var add = {
domain: data.domain,
type: data.type,
data: data.data,
background: data.background,
text: data.text
- };
- newobj.push(add);
+ }
+ newobj.push(add)
if (flags[i] == "true") {
- localStorage.setItem("card_" + i, "true");
+ localStorage.setItem("card_" + i, "true")
} else {
- localStorage.removeItem("card_" + i);
+ localStorage.removeItem("card_" + i)
}
}
- var json = JSON.stringify(newobj);
- localStorage.setItem("column", json);
- $("#sort").html("");
+ var json = JSON.stringify(newobj)
+ localStorage.setItem("column", json)
+ $("#sort").html("")
M.toast({ html: "Sorted", displayLength: 3000 })
- sortLoad();
- parseColumn();
+ sortLoad()
+ parseColumn()
sortMenu()
}
//ソートボタントグル
function sortMenu() {
- $("#left-menu a").removeClass("active");
- $("#sortMenu").addClass("active");
- $(".menu-content").addClass("hide");
- $("#sort-box").removeClass("hide");
- $("#sort").html("");
- sortLoad();
+ $("#left-menu a").removeClass("active")
+ $("#sortMenu").addClass("active")
+ $(".menu-content").addClass("hide")
+ $("#sort-box").removeClass("hide")
+ $("#sort").html("")
+ sortLoad()
}
\ No newline at end of file
diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js
index 3625493c..e6b71079 100644
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -2,86 +2,86 @@
//タイムライン
function utlShow(user, more, acct_id) {
if (!acct_id) {
- var acct_id = $("#his-data").attr("use-acct");
+ var acct_id = $("#his-data").attr("use-acct")
}
- var domain = localStorage.getItem("domain_" + acct_id);
- var at = localStorage.getItem("acct_" + acct_id + "_at");
+ var domain = localStorage.getItem("domain_" + acct_id)
+ var at = localStorage.getItem("acct_" + acct_id + "_at")
if (user == "--now") {
- var user = $("#his-data").attr("user-id");
+ var user = $("#his-data").attr("user-id")
}
if (localStorage.getItem("mode_" + domain) != "misskey") {
if (more) {
var sid = $("#his-tl .cvo")
.last()
- .attr("toot-id");
- var plus = "?max_id=" + sid;
+ .attr("toot-id")
+ var plus = "?max_id=" + sid
} else {
- var plus = "";
+ var plus = ""
}
- var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses" + plus;
+ var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses" + plus
var i = {
method: "GET",
headers: {
"content-type": "application/json",
Authorization: "Bearer " + at
}
- };
+ }
} else {
- var req = { i: at };
+ var req = { i: at }
if (more) {
var sid = $("#his-tl .cvo")
.last()
- .attr("toot-id");
- req.maxId = sid;
+ .attr("toot-id")
+ req.maxId = sid
}
- req.userId = user;
- var start = "https://" + domain + "/api/users/notes";
+ req.userId = user
+ var start = "https://" + domain + "/api/users/notes"
var i = {
method: "POST",
headers: {
"content-type": "application/json"
},
body: JSON.stringify(req)
- };
+ }
}
fetch(start, i)
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
- setLog(response.url, response.status, text);
- });
+ setLog(response.url, response.status, text)
+ })
}
- return response.json();
+ return response.json()
})
.catch(function(error) {
- todo(error);
- setLog(start, "JSON", error);
- console.error(error);
+ todo(error)
+ setLog(start, "JSON", error)
+ console.error(error)
})
.then(function(json) {
if (localStorage.getItem("mode_" + domain) == "misskey") {
- var templete = misskeyParse(json, "", acct_id, "user");
+ var templete = misskeyParse(json, "", acct_id, "user")
} else {
- var templete = parse(json, "", acct_id, "user");
+ var templete = parse(json, "", acct_id, "user")
}
if (!json[0]) {
- templete = lang.lang_details_nodata + "cancel " + '
';
- });
+ var domain = json[key]
+ templete = templete + domain + 'cancel " + '
'
+ })
if (more) {
- $("#his-domain-list-contents").append(templete);
+ $("#his-domain-list-contents").append(templete)
} else {
- $("#his-domain-list-contents").html(templete);
+ $("#his-domain-list-contents").html(templete)
}
- });
+ })
}
//フォローレコメンデーションリスト
function showFrl(more, acct_id) {
if (!acct_id) {
- var acct_id = $("#his-data").attr("use-acct");
+ var acct_id = $("#his-data").attr("use-acct")
}
- var domain = localStorage.getItem("domain_" + acct_id);
+ var domain = localStorage.getItem("domain_" + acct_id)
if (localStorage.getItem("mode_" + domain) == "misskey") {
- $("#his-follow-recom-contents").html(lang.lang_hisdata_notonmisskey + "Notestock ';
- $("#his-proof-prof").append(html);
+ var html = 'Notestock '
+ $("#his-proof-prof").append(html)
}
- });
+ })
}
diff --git a/app/js/userdata/prof-edit.js b/app/js/userdata/prof-edit.js
index 939b2ad0..73383e8e 100644
--- a/app/js/userdata/prof-edit.js
+++ b/app/js/userdata/prof-edit.js
@@ -1,65 +1,65 @@
//プロフ編集
//文字系
function profedit() {
- var acct_id = $('#his-data').attr("use-acct");
- todo("Updating...");
- var domain = localStorage.getItem("domain_" + acct_id);
- var at = localStorage.getItem("acct_" + acct_id + "_at");
- var start = "https://" + domain + "/api/v1/accounts/update_credentials";
- var name = $("#his-name-val").val();
- var des = $("#his-des-val").val();
- var httpreq = new XMLHttpRequest();
- httpreq.open('PATCH', start, true);
- httpreq.setRequestHeader('Content-Type', 'application/json');
- httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
- httpreq.responseType = "json";
+ var acct_id = $('#his-data').attr("use-acct")
+ todo("Updating...")
+ var domain = localStorage.getItem("domain_" + acct_id)
+ var at = localStorage.getItem("acct_" + acct_id + "_at")
+ var start = "https://" + domain + "/api/v1/accounts/update_credentials"
+ var name = $("#his-name-val").val()
+ var des = $("#his-des-val").val()
+ var httpreq = new XMLHttpRequest()
+ httpreq.open('PATCH', start, true)
+ httpreq.setRequestHeader('Content-Type', 'application/json')
+ httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+ httpreq.responseType = "json"
httpreq.send(JSON.stringify({
display_name: name,
note: des,
- }));
+ }))
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
- $('#his-data').modal('close');
- todc();
+ $('#his-data').modal('close')
+ todc()
}
}
}
//画像系
function imgChange(imgfile, target) {
- var acct_id = $('#his-data').attr("use-acct");
+ var acct_id = $('#his-data').attr("use-acct")
todo("アップロードしています")
if (!imgfile.files.length) {
- console.warn("No Image to upload");
- return;
+ console.warn("No Image to upload")
+ return
}
- var file = imgfile.files[0];
- var fr = new FileReader();
+ var file = imgfile.files[0]
+ var fr = new FileReader()
fr.onload = function (evt) {
- var b64 = this.result;
- var blob = toBlob(b64, 'image/png');
- var fd = new FormData();
- fd.append(target, blob);
- var domain = localStorage.getItem("domain_" + acct_id);
- var at = localStorage.getItem("acct_" + acct_id + "_at");
- var start = "https://" + domain + "/api/v1/accounts/update_credentials";
- var httpreq = new XMLHttpRequest();
- httpreq.open('PATCH', start, true);
- httpreq.upload.addEventListener("progress", progshow, false);
- httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
- httpreq.responseType = "json";
- httpreq.send(fd);
+ var b64 = this.result
+ var blob = toBlob(b64, 'image/png')
+ var fd = new FormData()
+ fd.append(target, blob)
+ var domain = localStorage.getItem("domain_" + acct_id)
+ var at = localStorage.getItem("acct_" + acct_id + "_at")
+ var start = "https://" + domain + "/api/v1/accounts/update_credentials"
+ var httpreq = new XMLHttpRequest()
+ httpreq.open('PATCH', start, true)
+ httpreq.upload.addEventListener("progress", progshow, false)
+ httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+ httpreq.responseType = "json"
+ httpreq.send(fd)
httpreq.onreadystatechange = function () {
if (httpreq.readyState === 4) {
- var json = httpreq.response;
- if(this.status!==200){ setLog(start, this.status, this.response); }
- $('#his-data').modal('close');
- todc();
- localStorage.removeItem("image");
+ var json = httpreq.response
+ if(this.status!==200){ setLog(start, this.status, this.response) }
+ $('#his-data').modal('close')
+ todc()
+ localStorage.removeItem("image")
}
}
}
- $("#prof-change").html($("#prof-change").html());
- $("#header-change").html($("#header-change").html());
- fr.readAsDataURL(file);
+ $("#prof-change").html($("#prof-change").html())
+ $("#header-change").html($("#header-change").html())
+ fr.readAsDataURL(file)
}
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index 21d412a6..c6a2375e 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -1,31 +1,31 @@
//ユーザーデータ表示
-localStorage.removeItem("history");
+localStorage.removeItem("history")
//コード受信
if (location.search) {
- var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
- var mode = m[1];
- var codex = m[2];
+ var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+ var mode = m[1]
+ var codex = m[2]
if (mode == "user") {
- udgEx(codex, "main");
+ udgEx(codex, "main")
}
}
function udgEx(user, acct_id) {
if (user == "selector") {
- user = $("#his-acct").attr("fullname");
+ user = $("#his-acct").attr("fullname")
}
if (acct_id == "selector") {
- acct_id = $("#user-acct-sel").val();
+ acct_id = $("#user-acct-sel").val()
}
if (acct_id == "main") {
- acct_id = localStorage.getItem("main");
+ acct_id = localStorage.getItem("main")
}
- console.log("Get user data of " + user);
- var domain = localStorage.getItem("domain_" + acct_id);
+ console.log("Get user data of " + user)
+ var domain = localStorage.getItem("domain_" + acct_id)
if (localStorage.getItem("mode_" + domain) == "misskey") {
- return false;
+ return false
}
- var at = localStorage.getItem("acct_" + acct_id + "_at");
- var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user);
+ var at = localStorage.getItem("acct_" + acct_id + "_at")
+ var start = "https://" + domain + "/api/v2/search?resolve=true&q=" + encodeURIComponent(user)
fetch(start, {
method: "GET",
headers: {
@@ -36,39 +36,39 @@ function udgEx(user, acct_id) {
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
- setLog(response.url, response.status, text);
- });
+ setLog(response.url, response.status, text)
+ })
}
- return response.json();
+ return response.json()
})
.catch(function(error) {
- todo(error);
- setLog(start, "JSON", error);
- console.error(error);
+ todo(error)
+ setLog(start, "JSON", error)
+ console.error(error)
})
.then(function(json) {
if (json.accounts[0]) {
- var id = json.accounts[0].id;
- udg(id, acct_id);
+ var id = json.accounts[0].id
+ udg(id, acct_id)
} else {
- postMessage(["openUrl", user], "*");
+ postMessage(["openUrl", user], "*")
}
- });
- return true;
+ })
+ return true
}
function udg(user, acct_id) {
- reset();
+ reset()
if (!user) {
- user = localStorage.getItem("user-id_" + acct_id);
+ user = localStorage.getItem("user-id_" + acct_id)
}
- todo("User Data Loading...");
- var domain = localStorage.getItem("domain_" + acct_id);
+ todo("User Data Loading...")
+ var domain = localStorage.getItem("domain_" + acct_id)
if (localStorage.getItem("mode_" + domain) == "misskey") {
- misskeyUdg(user, acct_id);
- return;
+ misskeyUdg(user, acct_id)
+ return
}
- var at = localStorage.getItem("acct_" + acct_id + "_at");
- var start = "https://" + domain + "/api/v1/accounts/" + user;
+ var at = localStorage.getItem("acct_" + acct_id + "_at")
+ var start = "https://" + domain + "/api/v1/accounts/" + user
fetch(start, {
method: "GET",
headers: {
@@ -79,188 +79,188 @@ function udg(user, acct_id) {
.then(function(response) {
if (!response.ok) {
response.text().then(function(text) {
- setLog(response.url, response.status, text);
- });
+ setLog(response.url, response.status, text)
+ })
}
- return response.json();
+ return response.json()
})
.catch(function(error) {
- todo(error);
- setLog(start, "JSON", error);
- console.error(error);
+ todo(error)
+ setLog(start, "JSON", error)
+ console.error(error)
})
.then(function(json) {
//一つ前のユーザーデータ
if (!localStorage.getItem("history")) {
- $("#his-history-btn").prop("disabled", true);
+ $("#his-history-btn").prop("disabled", true)
} else {
- $("#his-history-btn").prop("disabled", false);
- $("#his-data").attr("history", localStorage.getItem("history"));
+ $("#his-history-btn").prop("disabled", false)
+ $("#his-data").attr("history", localStorage.getItem("history"))
}
//moved設定時
if (json.moved) {
M.toast({
html: lang.lang_showontl_movetxt + '" + lang.lang_showontl_movebtn + " ",
displayLength: 4000
- });
+ })
}
- $("#his-data").modal("open");
- $("#his-data").attr("user-id", user);
- $("#his-data").attr("use-acct", acct_id);
+ $("#his-data").modal("open")
+ $("#his-data").attr("user-id", user)
+ $("#his-data").attr("use-acct", acct_id)
if (json.username != json.acct) {
//Remote
- $("#his-data").attr("remote", "true");
- var fullname = json.acct;
+ $("#his-data").attr("remote", "true")
+ var fullname = json.acct
} else {
- $("#his-data").attr("remote", "false");
- var fullname = json.acct + "@" + domain;
+ $("#his-data").attr("remote", "false")
+ var fullname = json.acct + "@" + domain
}
- utlShow(json.id, "", acct_id);
- flw(json.id, "", acct_id);
- fer(json.id, "", acct_id);
- var dis_name = escapeHTML(json.display_name);
- dis_name = twemoji.parse(dis_name);
+ utlShow(json.id, "", acct_id)
+ flw(json.id, "", acct_id)
+ fer(json.id, "", acct_id)
+ var dis_name = escapeHTML(json.display_name)
+ dis_name = twemoji.parse(dis_name)
- var note = json.note;
+ var note = json.note
if (json.emojis) {
- var actemojick = json.emojis[0];
+ var actemojick = json.emojis[0]
} else {
- var actemojick = false;
+ var actemojick = false
}
//絵文字があれば
if (actemojick) {
Object.keys(json.emojis).forEach(function(key5) {
- var emoji = json.emojis[key5];
- var shortcode = emoji.shortcode;
- var emoji_url = '#$1 ';
//var mens = '@$1 ';
//note=note.replace(/#(\S+)/gi, tags)
//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
- $("#his-name").html(dis_name);
- $("#his-acct").text(json.acct);
- $("#his-acct").attr("fullname", fullname);
- $("#his-prof").attr("src", json.avatar);
- $("#his-data").css("background-image", "url(" + json.header + ")");
- $("#his-sta").text(json.statuses_count);
- $("#his-follow").text(json.following_count);
- var flerc = json.followers_count;
+ $("#his-name").html(dis_name)
+ $("#his-acct").text(json.acct)
+ $("#his-acct").attr("fullname", fullname)
+ $("#his-prof").attr("src", json.avatar)
+ $("#his-data").css("background-image", "url(" + json.header + ")")
+ $("#his-sta").text(json.statuses_count)
+ $("#his-follow").text(json.following_count)
+ var flerc = json.followers_count
if (flerc < 0) {
- flerc = "-";
+ flerc = "-"
}
- $("#his-follower").text(flerc);
- $("#his-since").text(crat(json.created_at));
- $("#his-openin").attr("data-href", json.url);
+ $("#his-follower").text(flerc)
+ $("#his-since").text(crat(json.created_at))
+ $("#his-openin").attr("data-href", json.url)
if (json.fields) {
- var table = "";
+ var table = ""
if (json.fields.length > 0) {
- $("#his-des").css("max-height", "250px");
- table = '';
+ $("#his-des").css("max-height", "250px")
+ table = ''
for (var i = 0; i < json.fields.length; i++) {
- var fname = json.fields[i].name;
- var fval = json.fields[i].value;
+ var fname = json.fields[i].name
+ var fval = json.fields[i].value
if (json.fields[i].verified_at) {
- var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at);
- var color = "rgba(121,189,154,.25);";
+ var when = lang.lang_showontl_verified + ":" + crat(json.fields[i].verified_at)
+ var color = "rgba(121,189,154,.25);"
} else {
- var when = "";
- var color = "inherit";
+ var when = ""
+ var color = "inherit"
}
- table = table + '' + escapeHTML(fname) + ' ' + fval + " ' + escapeHTML(fname) + ' ' + fval + "
";
- $("#his-des").html(twemoji.parse(note));
+ table = table + "
"
+ $("#his-des").html(twemoji.parse(note))
} else {
- $("#his-des").css("max-height", "400px");
+ $("#his-des").css("max-height", "400px")
}
- $("#his-table").html(twemoji.parse(table));
+ $("#his-table").html(twemoji.parse(table))
} else {
- $("#his-des").css("max-height", "400px");
+ $("#his-des").css("max-height", "400px")
}
- $("#his-des").html(twemoji.parse(note));
+ $("#his-des").html(twemoji.parse(note))
if (json.bot) {
- $("#his-bot").html(lang.lang_showontl_botacct);
+ $("#his-bot").html(lang.lang_showontl_botacct)
}
- $("#his-des").attr("data-acct", acct_id);
- $("#his-data").css("background-size", "cover");
- $("#his-float-timeline").css("height", $("#his-data-show").height() + "px");
- localStorage.setItem("history", user);
+ $("#his-des").attr("data-acct", acct_id)
+ $("#his-data").css("background-size", "cover")
+ $("#his-float-timeline").css("height", $("#his-data-show").height() + "px")
+ localStorage.setItem("history", user)
//自分の時
if (json.acct == localStorage.getItem("user_" + acct_id)) {
- showFav("", acct_id);
- showBlo("", acct_id);
- showMut("", acct_id);
- showDom("", acct_id);
- showReq("", acct_id);
- showFrl("", acct_id);
- $("#his-name-val").val(json.display_name);
+ showFav("", acct_id)
+ showBlo("", acct_id)
+ showMut("", acct_id)
+ showDom("", acct_id)
+ showReq("", acct_id)
+ showFrl("", acct_id)
+ $("#his-name-val").val(json.display_name)
if (json.fields.length > 0) {
if (json.fields[0]) {
- $("#his-f1-name").val(json.fields[0].name);
- $("#his-f1-val").val($.strip_tags(json.fields[0].value));
+ $("#his-f1-name").val(json.fields[0].name)
+ $("#his-f1-val").val($.strip_tags(json.fields[0].value))
}
if (json.fields[1]) {
- $("#his-f2-name").val(json.fields[1].name);
- $("#his-f2-val").val($.strip_tags(json.fields[1].value));
+ $("#his-f2-name").val(json.fields[1].name)
+ $("#his-f2-val").val($.strip_tags(json.fields[1].value))
}
if (json.fields[2]) {
- $("#his-f3-name").val(json.fields[2].name);
- $("#his-f3-val").val($.strip_tags(json.fields[2].value));
+ $("#his-f3-name").val(json.fields[2].name)
+ $("#his-f3-val").val($.strip_tags(json.fields[2].value))
}
if (json.fields[3]) {
- $("#his-f4-name").val(json.fields[3].name);
- $("#his-f4-val").val($.strip_tags(json.fields[3].value));
+ $("#his-f4-name").val(json.fields[3].name)
+ $("#his-f4-val").val($.strip_tags(json.fields[3].value))
}
}
- var des = json.note;
- des = des.replace(/