tor-commits March 2016

tor-commits@lists.torproject.org

16 participants
1259 discussions

[torbutton/maint-1.9.4] Bug 18557: Exempt graphite from the security slider
by gk＠torproject.org 16 Mar '16

16 Mar '16

commit 8effc7ae7b20e7278c24999823736f6e09d4aba4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 15 20:55:06 2016 +0000 Bug 18557: Exempt graphite from the security slider We follow Mozilla's handling of the graphite library and apply it to all security slider levels. --- src/chrome/content/preferences.xul | 4 ++-- src/chrome/content/torbutton.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index dfc0f2e..60a214b 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -217,7 +217,7 @@ &torbutton.prefs.sec_mathml_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" @@ -255,7 +255,7 @@ &torbutton.prefs.sec_mathml_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf45fea..7e106da 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -250,7 +250,6 @@ var torbutton_unique_pref_observer = case "mathml.disabled": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": - case "gfx.font_rendering.graphite.enabled": case "noscript.globalHttpsWhitelist": case "noscript.global": case "svg.in-content.enabled": @@ -2295,7 +2294,6 @@ var torbutton_sec_ml_bool_prefs = { var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, - "gfx.font_rendering.graphite.enabled" : false, "gfx.font_rendering.opentype_svg.enabled" : false, "noscript.global" : false, "noscript.globalHttpsWhitelist" : true

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 16 Mar '16

16 Mar '16

commit b31b733ee56960e623d1d12f1980f1ef5b789ccc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 16 04:46:34 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- id/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/id/irc.properties b/id/irc.properties index 4fc394a..e75579a 100644 --- a/id/irc.properties +++ b/id/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=Sebuah galat terjadi saat mengirimkan pesan terakhir And # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=Anda mungkin tidak bergabung ke %1$S, dan secara otomatis dialihkan ke %2$S. +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' bukanlah mode pengguna yang valid pada server ini. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 16 Mar '16

16 Mar '16

commit c78d7845a993434d0246de18e363933cab787437 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 16 04:46:29 2016 +0000 Update translations for tor-messenger-ircproperties --- id/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/irc.properties b/id/irc.properties index 3c321f5..e75579a 100644 --- a/id/irc.properties +++ b/id/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Sebuah galat terjadi saat mengirimkan pesan terakhir And error.channelForward=Anda mungkin tidak bergabung ke %1$S, dan secara otomatis dialihkan ke %2$S. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' bukanlah mode pengguna yang valid pada server ini. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[tor-messenger-build/master] Rebase trac 13312 patch
by arlo＠torproject.org 16 Mar '16

16 Mar '16

commit eadc05ca503d717059f65088895c1943235cdf9e Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Mar 15 17:45:52 2016 -0700 Rebase trac 13312 patch * It's dependent on the bug-955324.patch but that'll be applied fix (lexical order) and has been marked for uplifting, so may be removed shortly. https://bugzilla.mozilla.org/show_bug.cgi?id=955324#c9 --- projects/instantbird/trac-13312.patch | 677 ++++++---------------------------- 1 file changed, 111 insertions(+), 566 deletions(-) diff --git a/projects/instantbird/trac-13312.patch b/projects/instantbird/trac-13312.patch index 7eb92b2..402b6b6 100644 --- a/projects/instantbird/trac-13312.patch +++ b/projects/instantbird/trac-13312.patch @@ -1,82 +1,16 @@ # HG changeset patch # User Arlo Breault <arlolra(a)gmail.com> -# Date 1456281485 28800 -# Tue Feb 23 18:38:05 2016 -0800 -# Branch THUNDERBIRD420b2_2015101216_RELBRANCH -# Node ID 9d547deb66802e3068767b5df2e687f6a56c5099 -# Parent a23c99d5fced84533a9a764bb63bbd67d874f62c -Update twitter.js to HEAD to ease applying dm patch +# Date 1458088842 25200 +# Tue Mar 15 17:40:42 2016 -0700 +# Branch THUNDERBIRD450b2_2016021821_RELBRANCH +# Node ID bdb92c8d38312d083b13dde6bc6ef405b410ed44 +# Parent 3711adcdfdd5439ff9d73e13eefe73193f1e6f95 +Changes to twitter.js upstream diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter.js --- a/chat/protocols/twitter/twitter.js +++ b/chat/protocols/twitter/twitter.js -@@ -1,35 +1,48 @@ - /* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - --const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components; -+var {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components; - - Cu.import("resource://gre/modules/Http.jsm"); - Cu.import("resource:///modules/imServices.jsm"); - Cu.import("resource:///modules/imXPCOMUtils.jsm"); - Cu.import("resource:///modules/jsProtoHelper.jsm"); - Cu.import("resource:///modules/twitter-text.jsm"); - --const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed"; --const kMaxMessageLength = 140; -+var NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed"; -+var kMaxMessageLength = 140; - --XPCOMUtils.defineLazyGetter(this, "_", function() -+XPCOMUtils.defineLazyGetter(this, "_", () => - l10nHelper("chrome://chat/locale/twitter.properties") - ); --XPCOMUtils.defineLazyGetter(this, "_lang", function() -+XPCOMUtils.defineLazyGetter(this, "_lang", () => - l10nHelper("chrome://global/locale/languageNames.properties") - ); - initLogModule("twitter", this); - --function ChatBuddy(aName) { -+function ChatBuddy(aName, aAccount) { - this._name = aName; -+ this._account = aAccount; - } --ChatBuddy.prototype = GenericConvChatBuddyPrototype; -+ChatBuddy.prototype = { -+ __proto__: GenericConvChatBuddyPrototype, -+ get buddyIconFilename() { -+ let userInfo = this._account._userInfo.get(this.name); -+ if (userInfo) -+ return userInfo.profile_image_url; -+ return undefined; -+ }, -+ set buddyIconFilename(aName) { -+ // Prevent accidental removal of the getter. -+ throw("Don't set chatBuddy.buddyIconFilename directly for Twitter."); -+ } -+} - - function Tweet(aTweet, aWho, aMessage, aObject) - { - this._tweet = aTweet; - this._init(aWho, aMessage, aObject); - } - Tweet.prototype = { - __proto__: GenericMessagePrototype, -@@ -102,26 +115,30 @@ Tweet.prototype = { - function Action(aLabel, aAction, aTweet) - { - this.label = aLabel; - this._action = aAction; - this._tweet = aTweet; - } - Action.prototype = { - __proto__: ClassInfo("prplIMessageAction", "generic message action object"), -- get run() this._action.bind(this._tweet) -+ get run() { return this._action.bind(this._tweet); } +@@ -124,17 +124,21 @@ Action.prototype = { }; function Conversation(aAccount) @@ -99,109 +33,14 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. let userInfo = aAccount._userInfo.get(aAccount.name); if ("description" in userInfo) this.setTopic(userInfo.description, aAccount.name, true); -@@ -137,24 +154,24 @@ Conversation.prototype = { - startReply: function(aTweet) { - this.inReplyToStatusId = aTweet.id_str; - let entities = aTweet.entities; - - // Twitter replies go to all the users mentioned in the tweet. - let nicks = [aTweet.user.screen_name]; - if ("user_mentions" in entities && Array.isArray(entities.user_mentions)) { - nicks = nicks.concat(entities.user_mentions -- .map(function(um) um.screen_name)); -+ .map(um => um.screen_name)); - } - // Ignore duplicates and the user's nick. - let prompt = - nicks.filter(function(aNick, aPos) { - return nicks.indexOf(aNick) == aPos && aNick != this._account.name; - }, this) -- .map(function(aNick) "@" + aNick) -+ .map(aNick => "@" + aNick) - .join(" ") + " "; - - this.notifyObservers(null, "replying-to-prompt", prompt); - this.notifyObservers(null, "status-text-changed", - _("replyingToStatusText", aTweet.text)); - }, - reTweet: function(aTweet) { - this._account.reTweet(aTweet, this.onSentCallback, -@@ -232,17 +249,17 @@ Conversation.prototype = { - let offset = text.indexOf(": ") + 2; - text = text.slice(0, offset) + retweet.text; - - // Keep any entities that refer to the prefix (we can refer directly to - // aTweet for these since they are not edited). - if ("entities" in aTweet) { - for (let type in aTweet.entities) { - let filteredEntities = -- aTweet.entities[type].filter(function(e) e.indices[0] < offset); -+ aTweet.entities[type].filter(e => e.indices[0] < offset); - if (filteredEntities.length) - entities[type] = filteredEntities; - } - } - - // Add the entities from the retweet (a copy of these must be made since - // they will be edited and we do not wish to change aTweet). - if ("entities" in retweet) { -@@ -250,17 +267,17 @@ Conversation.prototype = { - if (!(type in entities)) - entities[type] = []; - - // Append the entities from the original status. - entities[type] = entities[type].concat( - retweet.entities[type].map(function(aEntity) { - let entity = Object.create(aEntity); - // Add the offset to the indices to account for the prefix. -- entity.indices = entity.indices.map(function(i) i + offset); -+ entity.indices = entity.indices.map(i => i + offset); - return entity; - }) - ); - } - } - } else { - // For non-retweets, we just want to use the entities that are given. - if ("entities" in aTweet) -@@ -275,42 +292,43 @@ Conversation.prototype = { - * - str: the string that should be replaced inside the tweet, - * - href: the url (href attribute) of the created link tag, - * - [optional] text: the text to display for the link, - * The original string (str) will be used if this is not set. - * - [optional] title: the title attribute for the link. - */ - let entArray = []; - if ("hashtags" in entities && Array.isArray(entities.hashtags)) { -- entArray = entArray.concat(entities.hashtags.map(function(h) ({ -+ entArray = entArray.concat(entities.hashtags.map(h => ({ - start: h.indices[0], - end: h.indices[1], - str: "#" + h.text, - href: "https://twitter.com/#!/search?q=%23" + h.text}))); - } - if ("urls" in entities && Array.isArray(entities.urls)) { -- entArray = entArray.concat(entities.urls.map(function(u) ({ -+ entArray = entArray.concat(entities.urls.map(u => ({ - start: u.indices[0], - end: u.indices[1], - str: u.url, - text: u.display_url || u.url, - href: u.expanded_url || u.url}))); - } - if ("user_mentions" in entities && - Array.isArray(entities.user_mentions)) { -- entArray = entArray.concat(entities.user_mentions.map(function(um) ({ -+ entArray = entArray.concat(entities.user_mentions.map(um => ({ - start: um.indices[0], +@@ -314,17 +318,17 @@ Conversation.prototype = { end: um.indices[1], str: "@" + um.screen_name, -+ text: '@<span class="ib-person">' + um.screen_name + "</span>", + text: '@<span class="ib-person">' + um.screen_name + "</span>", title: um.name, href: "https://twitter.com/" + um.screen_name}))); } -- entArray.sort(function(a, b) a.start - b.start); -+ entArray.sort((a, b) => a.start - b.start); + entArray.sort((a, b) => a.start - b.start); let offset = 0; - for each (let entity in entArray) { + for (let entity of entArray) { @@ -213,100 +52,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. if (str.toLowerCase() != entity.str.toLowerCase()) continue; -@@ -332,36 +350,38 @@ Conversation.prototype = { - let text = this.parseTweet(aTweet); - - let flags = - name == this._account.name ? {outgoing: true} : {incoming: true}; - flags.time = Math.round(new Date(aTweet.created_at) / 1000); - flags._iconURL = aTweet.user.profile_image_url; - if (aTweet.delayed) - flags.delayed = true; -- if (text.includes("@" + this.nick)) -+ if (aTweet.entities && aTweet.entities.user_mentions && -+ Array.isArray(aTweet.entities.user_mentions) && -+ aTweet.entities.user_mentions.some(mention => mention.screen_name == this.nick)) - flags.containsNick = true; - - (new Tweet(aTweet, name, text, flags)).conversation = this; - }, - _ensureParticipantExists: function(aNick) { - if (this._participants.has(aNick)) - return; - -- let chatBuddy = new ChatBuddy(aNick); -+ let chatBuddy = new ChatBuddy(aNick, this._account); - this._participants.set(aNick, chatBuddy); - this.notifyObservers(new nsSimpleEnumerator([chatBuddy]), - "chat-buddy-add"); - }, -- get name() this.nick + " timeline", -- get title() _("timeline", this.nick), -- get nick() this._account.name, -+ get name() { return this.nick + " timeline"; }, -+ get title() { return _("timeline", this.nick); }, -+ get nick() { return this._account.name; }, - set nick(aNick) {}, -- get topicSettable() this.nick == this._account.name, -- get topic() this._topic, // can't add a setter without redefining the getter -+ get topicSettable() { return this.nick == this._account.name; }, -+ get topic() { return this._topic; }, // can't add a setter without redefining the getter - set topic(aTopic) { - if (this.topicSettable) - this._account.setUserDescription(aTopic); - } - }; - - function Account(aProtocol, aImAccount) - { -@@ -371,17 +391,17 @@ function Account(aProtocol, aImAccount) - this._friends = new Set(); - } - Account.prototype = { - __proto__: GenericAccountPrototype, - - // The correct normalization for twitter would be just toLowerCase(). - // Unfortunately, for backwards compatibility we retain this normalization, - // which can cause edge cases for usernames with underscores. -- normalize: function(aString) aString.replace(/[^a-z0-9]/gi, "").toLowerCase(), -+ normalize: aString => aString.replace(/[^a-z0-9]/gi, "").toLowerCase(), - - consumerKey: Services.prefs.getCharPref("chat.twitter.consumerKey"), - consumerSecret: Services.prefs.getCharPref("chat.twitter.consumerSecret"), - completionURI: "http://oauthcallback.local/", - baseURI: "https://api.twitter.com/", - _lastMsgId: "", - - // Use this to keep track of the pending timeline requests. We attempt to fetch -@@ -466,49 +486,49 @@ Account.prototype = { - - let dataParams = []; - let url = /^https?:/.test(aUrl) ? aUrl : this.baseURI + aUrl; - let urlSpec = url; - let queryIndex = url.indexOf("?"); - if (queryIndex != -1) { - urlSpec = url.slice(0, queryIndex); - dataParams = url.slice(queryIndex + 1).split("&") -- .map(function(p) p.split("=").map(percentEncode)); -+ .map(p => p.split("=").map(percentEncode)); - } - let method = "GET"; - if (aPOSTData) { - method = "POST"; - aPOSTData.forEach(function (p) { - dataParams.push(p.map(percentEncode)); - }); - } - - let signatureKey = this.consumerSecret + "&" + this.tokenSecret; - let signatureBase = - method + "&" + encodeURIComponent(urlSpec) + "&" + - params.concat(dataParams) -- .sort(function(a,b) (a[0] < b[0]) ? -1 : (a[0] > b[0]) ? 1 : 0) -- .map(function(p) p.map(encodeURIComponent).join("%3D")) -+ .sort((a, b) => (a[0] < b[0]) ? -1 : (a[0] > b[0]) ? 1 : 0) -+ .map(p => p.map(encodeURIComponent).join("%3D")) - .join("%26"); +@@ -507,17 +511,17 @@ Account.prototype = { let keyFactory = Cc["@mozilla.org/security/keyobjectfactory;1"] .getService(Ci.nsIKeyObjectFactory); @@ -323,27 +69,15 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. params.push(["oauth_signature", encodeURIComponent(signature)]); let authorization = -- "OAuth " + params.map(function (p) p[0] + "=\"" + p[1] + "\"").join(", "); -+ "OAuth " + params.map(p => p[0] + "=\"" + p[1] + "\"").join(", "); - - let options = { - headers: (aHeaders || []).concat([["Authorization", authorization]]), - postData: aPOSTData, - onLoad: aOnLoad ? aOnLoad.bind(aThis) : null, - onError: aOnError ? aOnError.bind(aThis) : null, - logger: {log: this.LOG.bind(this), - debug: this.DEBUG.bind(this)} -@@ -595,20 +615,20 @@ Account.prototype = { - getParams = "?q=" + trackQuery + lastMsgParam + "&count=100"; - let url = "1.1/search/tweets.json" + getParams; - this._pendingRequests.push( + "OAuth " + params.map(p => p[0] + "=\"" + p[1] + "\"").join(", "); + +@@ -615,17 +619,17 @@ Account.prototype = { this.signAndSend(url, null, null, this.onTimelineReceived, this.onTimelineError, this, null)); } }, -- get timeline() this._timeline || (this._timeline = new Conversation(this)), -+ get timeline() { return this._timeline || (this._timeline = new Conversation(this)); }, + get timeline() { return this._timeline || (this._timeline = new Conversation(this)); }, displayMessages: function(aMessages) { let lastMsgId = this._lastMsgId; - for each (let tweet in aMessages) { @@ -356,45 +90,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. // Compare the length of the ids first, and then the text. // This avoids converting tweet ids into rounded numbers. if (id.length > lastMsgId.length || -@@ -633,17 +653,17 @@ Account.prototype = { - - onTimelineReceived: function(aData, aRequest) { - this._timelineBuffer = this._timelineBuffer.concat(JSON.parse(aData)); - this._doneWithTimelineRequest(aRequest); - }, - - _doneWithTimelineRequest: function(aRequest) { - this._pendingRequests = -- this._pendingRequests.filter(function (r) r !== aRequest); -+ this._pendingRequests.filter(r => r !== aRequest); - - // If we are still waiting for more data, return early - if (this._pendingRequests.length != 0) - return; - - if (this._timelineAuthError >= 2) { - // 2 out of the 3 timeline requests are authenticated. - // With at least 2 '401 - Unauthorized' errors, we are sure -@@ -678,17 +698,17 @@ Account.prototype = { - // Reset in case we get disconnected - delete this._timelineBuffer; - delete this._pendingRequests; - - // Open the streams to get the live data. - this.openStream(); - }, - -- sortByDate: function(a, b) -+ sortByDate: (a, b) => - (new Date(a["created_at"])) - (new Date(b["created_at"])), - - _streamingRequest: null, - _pendingData: "", - openStream: function() { - let track = this.getString("track"); - this._streamingRequest = - this.signAndSend("https://userstream.twitter.com/1.1/user.json", null, -@@ -717,48 +737,48 @@ Account.prototype = { +@@ -734,33 +738,33 @@ Account.prototype = { this.gotDisconnected(Ci.prplIAccount.ERROR_NETWORK_ERROR, "timeout"); }, onDataAvailable: function(aRequest) { @@ -424,59 +120,15 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. + for (let userInfo of this._userInfo.values()) userInfoIds.add(userInfo.id_str); let ids = msg.friends.filter( -- function(aId) !userInfoIds.has(aId.toString()), this); -+ aId => !userInfoIds.has(aId.toString())); + aId => !userInfoIds.has(aId.toString())); while (ids.length) { // Take the first 100 elements, turn them into a comma separated list. this.signAndSend("1.1/users/lookup.json", null, [["user_id", ids.slice(0, 99).join(",")]], - this.onLookupReceived, null, this); - // Remove the first 100 elements. - ids = ids.slice(100); - } - - // Overwrite the existing _friends list (if any). -- this._friends = new Set(msg.friends.map(function(aId) aId.toString())); -+ this._friends = new Set(msg.friends.map(aId => aId.toString())); - } - else if ("event" in msg) { - let user, event; - switch(msg.event) { - case "follow": - if (msg.source.screen_name == this.name) { - this._friends.add(msg.target.id_str); - user = msg.target; -@@ -806,17 +826,17 @@ Account.prototype = { - }, - requestAuthorization: function() { - this.reportConnecting(_("connection.requestAuth")); - let url = this.baseURI + "oauth/authorize?" + - "force_login=true&" + // ignore cookies - "screen_name=" + this.name + "&" + // prefill the user name input box - "oauth_token=" + this.token; - this._browserRequest = { -- get promptText() _("authPrompt"), -+ get promptText() { return _("authPrompt"); }, - account: this, - url: url, - _active: true, - cancelled: function() { - if (!this._active) - return; - - this.account -@@ -920,24 +940,24 @@ Account.prototype = { - - if (aAuthResult.screen_name.toLowerCase() != this.name.toLowerCase()) { - this.onError(_("connection.error.userMismatch")); - return false; - } - - this.LOG("Fixing the case of the account name: " + +@@ -946,17 +950,17 @@ Account.prototype = { this.name + " -> " + aAuthResult.screen_name); -- this.__defineGetter__("name", function() aAuthResult.screen_name); -+ this.__defineGetter__("name", () => aAuthResult.screen_name); + this.__defineGetter__("name", () => aAuthResult.screen_name); return true; }, @@ -493,54 +145,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. delete this._streamTimeout; // Remove the preference observer that is added when the user stream is // opened. (This needs to be removed even if an error occurs, in which -@@ -1019,117 +1039,119 @@ Account.prototype = { - this.signAndSend("1.1/users/show.json?screen_name=" + aBuddyName, null, - null, this.onRequestedInfoReceived, null, this); - return; - } - - // List of the names of the info to actually show in the tooltip and - // optionally a transform function to apply to the value. - // See https://dev.twitter.com/docs/api/1/get/users/show for the options. -- let normalizeBool = function(isFollowing) _(isFollowing ? "yes" : "no"); -+ let normalizeBool = isFollowing => _(isFollowing ? "yes" : "no"); - const kFields = { - name: null, - following: normalizeBool, - description: null, - url: null, - location: null, - lang: function(aLang) { - try { - return _lang(aLang); - } - catch(e) { - return aLang; - } - }, - time_zone: null, - protected: normalizeBool, -- created_at: function(aDate) (new Date(aDate)).toLocaleDateString(), -+ created_at: aDate => (new Date(aDate)).toLocaleDateString(), - statuses_count: null, - friends_count: null, - followers_count: null, - listed_count: null - }; - - let tooltipInfo = []; - for (let field in kFields) { - if (Object.prototype.hasOwnProperty.call(userInfo, field) && - userInfo[field]) { - let value = userInfo[field]; - if (kFields[field]) - value = kFields[field](value); - tooltipInfo.push(new TooltipInfo(_("tooltip." + field), value)); - } - } -+ tooltipInfo.push(new TooltipInfo(null, userInfo.profile_image_url, -+ Ci.prplITooltipInfo.icon)); - +@@ -1083,17 +1087,17 @@ Account.prototype = { Services.obs.notifyObservers(new nsSimpleEnumerator(tooltipInfo), "user-info-received", aBuddyName); }, @@ -559,152 +164,22 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. onConfigReceived: function(aData) { this.config = JSON.parse(aData); }, - - // Allow us to reopen the timeline via the join chat menu. -- get canJoinChat() true, -+ get canJoinChat() { return true; }, - joinChat: function(aComponents) { - // The 'timeline' getter opens a timeline conversation if none exists. - this.timeline; - } - }; - - // Shortcut to get the JavaScript account object. --function getAccount(aConv) aConv.wrappedJSObject._account; -+function getAccount(aConv) { return aConv.wrappedJSObject._account; } - - function TwitterProtocol() { - this.registerCommands(); - } - TwitterProtocol.prototype = { - __proto__: GenericProtocolPrototype, -- get normalizedName() "twitter", -- get name() _("twitter.protocolName"), -- get iconBaseURI() "chrome://prpl-twitter/skin/", -- get noPassword() true, -+ get normalizedName() { return "twitter"; }, -+ get name() { return _("twitter.protocolName"); }, -+ get iconBaseURI() { return "chrome://prpl-twitter/skin/"; }, -+ get noPassword() { return true; }, - options: { -- "track": {get label() _("options.track"), default: ""} -+ "track": {get label() { return _("options.track"); }, default: ""} - }, - // Replace the command name in the help string so translators do not attempt - // to translate it. - commands: [ - { - name: "follow", -- get helpString() _("command.follow", "follow"), -+ get helpString() { return _("command.follow", "follow"); }, - run: function(aMsg, aConv) { - aMsg = aMsg.trim(); - if (!aMsg) - return false; - let account = getAccount(aConv); - aMsg.split(" ").forEach(account.follow, account); - return true; - } - }, - { - name: "unfollow", -- get helpString() _("command.unfollow", "unfollow"), -+ get helpString() { return _("command.unfollow", "unfollow"); }, - run: function(aMsg, aConv) { - aMsg = aMsg.trim(); - if (!aMsg) - return false; - let account = getAccount(aConv); - aMsg.split(" ").forEach(account.stopFollowing, account); - return true; - } - } - ], -- getAccount: function(aImAccount) new Account(this, aImAccount), -+ getAccount: function(aImAccount) { return new Account(this, aImAccount); }, - classID: Components.ID("{31082ff6-1de8-422b-ab60-ca0ac0b2af13}") - }; - --const NSGetFactory = XPCOMUtils.generateNSGetFactory([TwitterProtocol]); -+var NSGetFactory = XPCOMUtils.generateNSGetFactory([TwitterProtocol]); # HG changeset patch # User Arlo Breault <arlolra(a)gmail.com> -# Date 1456343323 28800 -# Wed Feb 24 11:48:43 2016 -0800 -# Branch THUNDERBIRD420b2_2015101216_RELBRANCH -# Node ID 1302396bc5605fff3ba7b2b7a762db98630378fa -# Parent 9d547deb66802e3068767b5df2e687f6a56c5099 -Bug 955642 - Handle Twitter direct messages (DMs) +# Date 1458087696 25200 +# Tue Mar 15 17:21:36 2016 -0700 +# Branch THUNDERBIRD450b2_2016021821_RELBRANCH +# Node ID 6892b93f1644036c463fe8b6014e4601d58d1676 +# Parent bdb92c8d38312d083b13dde6bc6ef405b410ed44 +Update twitter-text.jsm -diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js ---- a/chat/components/src/imConversations.js -+++ b/chat/components/src/imConversations.js -@@ -25,16 +25,17 @@ OutgoingMessage.prototype = { - action: false - }; - - function imMessage(aPrplMessage) { - this.prplMessage = aPrplMessage; - } - imMessage.prototype = { - __proto__: ClassInfo(["imIMessage", "prplIMessage"], "IM Message"), -+ get wrappedJSObject() { return this; }, - cancelled: false, - color: "", - _displayMessage: null, - - get displayMessage() { - // Explicitly test for null so that blank messages don't fall back to - // the original. Especially problematic in encryption extensions like OTR. - return this._displayMessage !== null ? -@@ -409,17 +410,18 @@ UIConversation.prototype = { - this._observers = this._observers.filter(function(o) o !== aObserver); - }, - notifyObservers: function(aSubject, aTopic, aData) { - if (aTopic == "new-text") { - aSubject = new imMessage(aSubject); - this.notifyObservers(aSubject, "received-message"); - if (aSubject.cancelled) - return; -- aSubject.conversation.prepareForDisplaying(aSubject); -+ if (!aSubject.system) -+ aSubject.conversation.prepareForDisplaying(aSubject); - - this._messages.push(aSubject); - ++this._unreadMessageCount; - if (aSubject.incoming && !aSubject.system) { - ++this._unreadIncomingMessageCount; - if (!this.isChat || aSubject.containsNick) - ++this._unreadTargetedMessageCount; - } -diff --git a/chat/modules/jsProtoHelper.jsm b/chat/modules/jsProtoHelper.jsm ---- a/chat/modules/jsProtoHelper.jsm -+++ b/chat/modules/jsProtoHelper.jsm -@@ -373,16 +373,17 @@ const GenericAccountBuddyPrototype = { - // aUserName is required only if aBuddy is null, i.e., we are adding a buddy. - function AccountBuddy(aAccount, aBuddy, aTag, aUserName) { - this._init(aAccount, aBuddy, aTag, aUserName); - } - AccountBuddy.prototype = GenericAccountBuddyPrototype; - - const GenericMessagePrototype = { - __proto__: ClassInfo("prplIMessage", "generic message object"), -+ get wrappedJSObject() { return this; }, - - _lastId: 0, - _init: function (aWho, aMessage, aObject) { - this.id = ++GenericMessagePrototype._lastId; - this.time = Math.round(new Date() / 1000); - this.who = aWho; - this.message = aMessage; - this.originalMessage = aMessage; diff --git a/chat/protocols/twitter/twitter-text.jsm b/chat/protocols/twitter/twitter-text.jsm --- a/chat/protocols/twitter/twitter-text.jsm +++ b/chat/protocols/twitter/twitter-text.jsm @@ -14,17 +14,17 @@ */ - const EXPORTED_SYMBOLS = ["twttr"]; + this.EXPORTED_SYMBOLS = ["twttr"]; var window = {}; @@ -1226,10 +701,81 @@ diff --git a/chat/protocols/twitter/twitter-text.jsm b/chat/protocols/twitter/tw } else { window.twttr = twttr; } +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1458087794 25200 +# Tue Mar 15 17:23:14 2016 -0700 +# Branch THUNDERBIRD450b2_2016021821_RELBRANCH +# Node ID 423fc04d0bbbf681f1f930d2f242fd2605a5e425 +# Parent 6892b93f1644036c463fe8b6014e4601d58d1676 +Bug 955642 - Handle Twitter direct messages (DMs) + +diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js +--- a/chat/components/src/imConversations.js ++++ b/chat/components/src/imConversations.js +@@ -25,16 +25,17 @@ OutgoingMessage.prototype = { + action: false + }; + + function imMessage(aPrplMessage) { + this.prplMessage = aPrplMessage; + } + imMessage.prototype = { + __proto__: ClassInfo(["imIMessage", "prplIMessage"], "IM Message"), ++ get wrappedJSObject() { return this; }, + cancelled: false, + color: "", + _displayMessage: null, + + get displayMessage() { + // Explicitly test for null so that blank messages don't fall back to + // the original. Especially problematic in encryption extensions like OTR. + return this._displayMessage !== null ? +@@ -409,17 +410,18 @@ UIConversation.prototype = { + this._observers = this._observers.filter(o => o !== aObserver); + }, + notifyObservers: function(aSubject, aTopic, aData) { + if (aTopic == "new-text") { + aSubject = new imMessage(aSubject); + this.notifyObservers(aSubject, "received-message"); + if (aSubject.cancelled) + return; +- aSubject.conversation.prepareForDisplaying(aSubject); ++ if (!aSubject.system) ++ aSubject.conversation.prepareForDisplaying(aSubject); + + this._messages.push(aSubject); + ++this._unreadMessageCount; + if (aSubject.incoming && !aSubject.system) { + ++this._unreadIncomingMessageCount; + if (!this.isChat || aSubject.containsNick) + ++this._unreadTargetedMessageCount; + } +diff --git a/chat/modules/jsProtoHelper.jsm b/chat/modules/jsProtoHelper.jsm +--- a/chat/modules/jsProtoHelper.jsm ++++ b/chat/modules/jsProtoHelper.jsm +@@ -376,16 +376,17 @@ var GenericAccountBuddyPrototype = { + // aUserName is required only if aBuddy is null, i.e., we are adding a buddy. + function AccountBuddy(aAccount, aBuddy, aTag, aUserName) { + this._init(aAccount, aBuddy, aTag, aUserName); + } + AccountBuddy.prototype = GenericAccountBuddyPrototype; + + var GenericMessagePrototype = { + __proto__: ClassInfo("prplIMessage", "generic message object"), ++ get wrappedJSObject() { return this; }, + + _lastId: 0, + _init: function (aWho, aMessage, aObject) { + this.id = ++GenericMessagePrototype._lastId; + this.time = Math.round(new Date() / 1000); + this.who = aWho; + this.message = aMessage; + this.originalMessage = aMessage; diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter.js --- a/chat/protocols/twitter/twitter.js +++ b/chat/protocols/twitter/twitter.js -@@ -31,32 +31,41 @@ ChatBuddy.prototype = { +@@ -31,32 +31,40 @@ ChatBuddy.prototype = { let userInfo = this._account._userInfo.get(this.name); if (userInfo) return userInfo.profile_image_url; @@ -1258,7 +804,6 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. let actions = []; - if (account.connected) { -+ // TODO(arlolra): DirectMessageConversation actions. + if (!this.conversation.isChat) { + if (aCount) + aCount.value = actions.length; @@ -1273,7 +818,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. if (this.incoming) { actions.push( new Action(_("action.retweet"), function() { -@@ -118,17 +127,109 @@ function Action(aLabel, aAction, aTweet) +@@ -118,17 +126,109 @@ function Action(aLabel, aAction, aTweet) this._action = aAction; this._tweet = aTweet; } @@ -1384,7 +929,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. let entries = []; for (let [name, userInfo] of aAccount._userInfo) { entries.push([userInfo.id_str, name]); -@@ -139,17 +240,17 @@ function Conversation(aAccount) +@@ -139,17 +239,17 @@ function Conversation(aAccount) // If the user's info has already been received, update the timeline topic. if (aAccount._userInfo.has(aAccount.name)) { @@ -1403,7 +948,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. inReplyToStatusId: null, startReply: function(aTweet) { this.inReplyToStatusId = aTweet.id_str; -@@ -169,203 +270,66 @@ Conversation.prototype = { +@@ -169,203 +269,66 @@ Conversation.prototype = { .map(aNick => "@" + aNick) .join(" ") + " "; @@ -1632,7 +1177,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. let chatBuddy = new ChatBuddy(aNick, this._account); this._participants.set(aNick, chatBuddy); this.notifyObservers(new nsSimpleEnumerator([chatBuddy]), -@@ -377,23 +341,60 @@ Conversation.prototype = { +@@ -377,23 +340,60 @@ Conversation.prototype = { set nick(aNick) {}, get topicSettable() { return this.nick == this._account.name; }, get topic() { return this._topic; }, // can't add a setter without redefining the getter @@ -1658,13 +1203,13 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. + }, this); + }, + displayMessages: function(aMessages) { -+ // let account = this._account; ++ let account = this._account; + for (let tweet of aMessages) { + if (!("sender" in tweet) || !("recipient" in tweet) || + !("text" in tweet) || !("id_str" in tweet)) + continue; -+ // account.setUserInfo(tweet.sender); -+ // account.setUserInfo(tweet.recipient); ++ account.setUserInfo(tweet.sender); ++ account.setUserInfo(tweet.recipient); + this.displayTweet(tweet, tweet.sender); + } + }, @@ -1693,7 +1238,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. // Unfortunately, for backwards compatibility we retain this normalization, // which can cause edge cases for usernames with underscores. normalize: aString => aString.replace(/[^a-z0-9]/gi, "").toLowerCase(), -@@ -554,16 +555,21 @@ Account.prototype = { +@@ -554,16 +554,21 @@ Account.prototype = { reTweet: function(aTweet, aOnSent, aOnError, aThis) { let url = "1.1/statuses/retweet/" + aTweet.id_str + ".json"; this.signAndSend(url, null, [], aOnSent, aOnError, aThis); @@ -1715,7 +1260,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. }, stopFollowing: function(aUserName) { // friendships/destroy will return the user in case of success. -@@ -615,39 +621,17 @@ Account.prototype = { +@@ -616,39 +621,17 @@ Account.prototype = { getParams = "?q=" + trackQuery + lastMsgParam + "&count=100"; let url = "1.1/search/tweets.json" + getParams; this._pendingRequests.push( @@ -1756,7 +1301,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. this._doneWithTimelineRequest(aRequest); }, -@@ -685,17 +669,17 @@ Account.prototype = { +@@ -686,17 +669,17 @@ Account.prototype = { this.reportConnected(); // If the conversation already exists, notify it we are back online. @@ -1775,7 +1320,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. delete this._timelineBuffer; delete this._pendingRequests; -@@ -747,18 +731,23 @@ Account.prototype = { +@@ -748,18 +731,23 @@ Account.prototype = { continue; let msg; try { @@ -1801,7 +1346,7 @@ diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter. userInfoIds.add(userInfo.id_str); let ids = msg.friends.filter( aId => !userInfoIds.has(aId.toString())); -@@ -1099,16 +1088,29 @@ Account.prototype = { +@@ -1102,16 +1090,29 @@ Account.prototype = { this.config = JSON.parse(aData); },

1 0

[tor-messenger-build/master] Rebase trac 17494 patch
by arlo＠torproject.org 15 Mar '16

15 Mar '16

commit dfdbd9096207126769e42ff8ba97492bf8fd2a9b Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Mar 15 12:56:46 2016 -0700 Rebase trac 17494 patch --- projects/instantbird/trac-17494.patch | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/projects/instantbird/trac-17494.patch b/projects/instantbird/trac-17494.patch index 87b597f..fcd7703 100644 --- a/projects/instantbird/trac-17494.patch +++ b/projects/instantbird/trac-17494.patch @@ -1,16 +1,14 @@ # HG changeset patch # User Arlo Breault <arlolra(a)gmail.com> -# Date 1455420371 28800 -# Sat Feb 13 19:26:11 2016 -0800 -# Branch THUNDERBIRD420b2_2015101216_RELBRANCH -# Node ID f0960c2da89ebf290595a5f07be1d4fc373992bc -# Parent a23c99d5fced84533a9a764bb63bbd67d874f62c +# Date 1454457891 28800 +# Node ID 4cfc2a04ebe02f53d789c7c27f8c3cd2a40b6483 +# Parent 19694424a48639d4f9ca458e3e891292e0c2ae1e Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties --- a/chat/locales/en-US/xmpp.properties +++ b/chat/locales/en-US/xmpp.properties -@@ -61,18 +61,20 @@ conversation.error.changeTopicFailedNotA +@@ -61,31 +61,33 @@ conversation.error.changeTopicFailedNotA # %2$S is the text of the message that wasn't delivered. conversation.error.sendFailedAsNotInRoom=Message could not be sent to %1$S as you are no longer in the room: %2$S # This is displayed in a conversation as an error message when the user sends @@ -20,11 +18,24 @@ diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.proper conversation.error.sendFailedAsRecipientNotInRoom=Message could not be sent to %1$S as the recipient is no longer in the room: %2$S # These are displayed in a conversation as a system error message. -conversation.error.remoteServerNotFound=Could not reach the recipient's server --conversation.error.unknownError=Unknown error +conversation.error.remoteServerNotFound=Could not reach the recipient's server. +conversation.error.unknownSendError=An unknown error occurred on sending this message. +# %S is the name of the message recipient. +conversation.error.sendServiceUnavailable=It is not possible to send messages to %S at this time. + # %S is the nick of participant that is not in room. + conversation.error.nickNotInRoom=%S is not in the room. + conversation.error.banCommandAnonymousRoom=You can't ban participants from anonymous rooms. Try /kick instead. + conversation.error.banKickCommandNotAllowed=You don't have the required privileges to remove this participant from the room. + conversation.error.banKickCommandConflict=Sorry, you can't remove yourself from the room. + conversation.error.changeNickFailedConflict=Could not change your nick to %S as this nick is already in use. + conversation.error.changeNickFailedNotAcceptable=Could not change your nick to %S as nicks are locked down in this room. + conversation.error.inviteFailedForbidden=You don't have the required privileges to invite users to this room. + # %S is the jid of user that is invited. + conversation.error.failedJIDNotFound=Could not reach %S. + # %S is the jid that is invalid. + conversation.error.invalidJID=%S is an invalid jid (Jabber identifiers must be of the form user@domain). + conversation.error.commandFailedNotInRoom=You have to rejoin the room to be able to use this command. +-conversation.error.unknownError=Unknown error # LOCALIZATION NOTE (tooltip.*): # These are the titles of lines of information that will appear in @@ -36,7 +47,7 @@ diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.proper diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm -@@ -479,21 +479,28 @@ const XMPPConversationPrototype = { +@@ -674,21 +674,28 @@ var XMPPConversationPrototype = { this._targetResource = this._account._parseJID(from).resource; let flags = {}; let error = this._account.parseError(aStanza);

1 0

[torspec/master] Apply notes from last month's meeting about prop264, 266.
by nickm＠torproject.org 15 Mar '16

15 Mar '16

commit 2a9f49b8be4a2ea3253bf6c75608221df2d5462e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 15 13:36:45 2016 -0400 Apply notes from last month's meeting about prop264,266. --- proposals/264-subprotocol-versions.txt | 26 ++++++---- .../266-removing-current-obsolete-clients.txt | 56 ++++++++++++++++++++++ 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt index 240422b..077ae55 100644 --- a/proposals/264-subprotocol-versions.txt +++ b/proposals/264-subprotocol-versions.txt @@ -116,18 +116,19 @@ Status: Open 4. Required protocols - The consensus may contain three lines: RequiredRelayProtocols, - RecommendedClientProtocols, and RequiredClientProtocols. Each has - the same format as the "protos" line. To vote on these entries, a - protocol/version combination is included only if it is listed by a - majority of the voters. + The consensus may contain four lines: RecommendedRelayProtocols, + RequiredRelayProtocols, RecommendedClientProtocols, and + RequiredClientProtocols. Each has the same format as the "protos" line. + To vote on these entries, a protocol/version combination is included only + if it is listed by a majority of the voters. + + + When a relay lacks a protocol listed in RecommendeddRelayProtocols, it + should warn its operator that the relay is obsolete. When a relay lacks a protocol listed in RequiredRelayProtocols, it must not attempt to join the network. - When a relay lacks a protocol listed in RecommendedRelayProtocols, it - should warn its operator that the relay is obsolete.. - When a client lacks a protocol listed in RecommendedClientProtocols, it should warn the user that the client is obsolete. @@ -139,7 +140,14 @@ Status: Open protocol is required, and it does not implement that protocol, it SHOULD NOT try to fetch a newer consensus. - The above features should be backported to 0.2.4 and later. + The above features should be backported to 0.2.4 and later, or all the + versions we expect to continue supporting. + + + These lines should be voted on, and should require a supermajority of + authorities (2/3) to make a protocol required. The required protocols + should not be torrc-configurable, but rather should be hardwired in the + Tor code. 5. Current protocols diff --git a/proposals/266-removing-current-obsolete-clients.txt b/proposals/266-removing-current-obsolete-clients.txt index 7a490be..d803c41 100644 --- a/proposals/266-removing-current-obsolete-clients.txt +++ b/proposals/266-removing-current-obsolete-clients.txt @@ -203,3 +203,59 @@ Status: Draft [This proposal would result in the quietest shutdown.] +A. How to "pull the switch." + + This is an example timeline of how we could implement 3.3 above, + along with proposal 264. + + TIME 0: + Implement the client/relay side of proposal 264, backported + to every currently existant Tor version that we still + support. + + At the same time, add support for the new consensus type to + all the same Tor versions. + + Don't disable anything yet. + + TIME 1....N: + Encourage all distributions shipping packages for those old + tor versions to upgrade to ones released at Time 0 or later. + + Keep informed of the upgrade status of the clients and + relays on the Tor network. + + + LATER: + At some point after nearly all clients and relays hav + upgraded to the versions released at Time 0 or later, we + could make the switchover to publishing the new consensus + type. + + +B. Next steps. + + We should verify what happens when currently extant client + versions get an empty consensus. This will determine whether + 3.3 will not work. Will they try to fetch a new one from the + authorities at the end of the validity period. + + Another option is from Roger: we could add a flag meaning "ignore + this consensus; it is a poison consensus to kill old Tor + versions." And maybe we could have it signed only by keys that + the current clients won't accept. And we could serve it to old + clients rather than serving them the real consensus. And we + could give it a really high expiration time. New clients + wouldn't believe it. We'd need to flesh this out. + + Another option is also from Roger: Tell new clients about new + locations to fetch directories from. Keep the old locations working + for as long as we want to support them. We'd need to flesh this + out too. + + The timeline above requires us to keep informed of the status of + the different clients and relays attempting to connect to the tor + network. We should make sure we'll actually able to do so. + + http://meetbot.debian.net/tor-dev/2016/tor-dev.2016-02-12-15.01.log.html + has a more full discussion of the above ideas.

1 0

[nyx/master] Move key_input() to nyx.curses
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit a147f342171e70c3b756ad38cb9145ff7e67c2ac Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 10:08:25 2016 -0700 Move key_input() to nyx.curses This has always belonged as a function. This allows us to drop direct curses usage from the controller - only spots left are a couple addch() calls in the panels! --- nyx/controller.py | 22 ++--------------- nyx/curses.py | 69 ++++++++++++++++++++++++++++++++++------------------- nyx/menu/menu.py | 2 +- nyx/panel/config.py | 2 +- nyx/panel/graph.py | 2 +- nyx/popups.py | 16 ++++++------- 6 files changed, 57 insertions(+), 56 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 7b96134..602c85e 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -3,10 +3,7 @@ Main interface loop for nyx, periodically redrawing the screen and issuing user input to the proper panels. """ -from __future__ import absolute_import - import time -import curses import threading import nyx.curses @@ -34,8 +31,7 @@ NYX_CONTROLLER = None def conf_handler(key, value): if key == 'features.redrawRate': - # https://docs.python.org/2/library/curses.html?#curses.halfdelay - return min(max(1, value), 25.5) + return max(1, value) elif key == 'features.refreshRate': return max(0, value) @@ -146,20 +142,6 @@ class Controller: return self._screen - def key_input(self, input_timeout = None): - """ - Gets keystroke from the user. - - :param int input_timeout: duration in seconds to wait for user input - """ - - if input_timeout: - curses.halfdelay(input_timeout * 10) - else: - curses.cbreak() # wait indefinitely for key presses (no timeout) - - return nyx.curses.KeyInput(self.get_screen().getch()) - def get_page_count(self): """ Provides the number of pages the interface has. This may be zero if all @@ -436,7 +418,7 @@ def start_nyx(stdscr): if override_key: key, override_key = override_key, None else: - key = control.key_input(CONFIG['features.redrawRate']) + key = nyx.curses.key_input(CONFIG['features.redrawRate']) if key.match('right'): control.next_page() diff --git a/nyx/curses.py b/nyx/curses.py index a2d0dfa..0b6e24a 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -8,8 +8,9 @@ if we want Windows support in the future too. :: - curses_attr - curses encoded text attribute start - initializes curses with the given function + key_input - get keypress by user + curses_attr - curses encoded text attribute is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -131,29 +132,6 @@ CONFIG = stem.util.conf.config_dict('nyx', { }, conf_handler) -def curses_attr(*attributes): - """ - Provides encoding for the given curses text attributes. - - :param list attributes: curses text attributes and colors - - :returns: **int** that can be used with curses - """ - - encoded = curses.A_NORMAL - - for attr in attributes: - if attr in Color: - override = get_color_override() - encoded |= _color_attr()[override if override else attr] - elif attr in Attr: - encoded |= CURSES_ATTRIBUTES[attr] - else: - raise ValueError("'%s' isn't a valid curses text attribute" % attr) - - return encoded - - def start(function, transparent_background = False, cursor = True): """ Starts a curses interface, delegating to the given function. The function @@ -186,6 +164,49 @@ def start(function, transparent_background = False, cursor = True): curses.wrapper(_wrapper) +def key_input(input_timeout = None): + """ + Gets a key press from the user. + + :param int input_timeout: duration in seconds to wait for user input + + :returns: :class:`~nyx.curses.KeyInput` that was pressed + """ + + if input_timeout: + # Timeout can't be longer than 25.5 seconds... + # https://docs.python.org/2/library/curses.html?#curses.halfdelay + + curses.halfdelay(min(input_timeout, 25.5) * 10) + else: + curses.cbreak() # wait indefinitely for key presses (no timeout) + + return KeyInput(CURSES_SCREEN.getch()) + + +def curses_attr(*attributes): + """ + Provides encoding for the given curses text attributes. + + :param list attributes: curses text attributes and colors + + :returns: **int** that can be used with curses + """ + + encoded = curses.A_NORMAL + + for attr in attributes: + if attr in Color: + override = get_color_override() + encoded |= _color_attr()[override if override else attr] + elif attr in Attr: + encoded |= CURSES_ATTRIBUTES[attr] + else: + raise ValueError("'%s' isn't a valid curses text attribute" % attr) + + return encoded + + def is_color_supported(): """ Checks if curses currently supports rendering colors. diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 7d49b3e..da22362 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -119,7 +119,7 @@ def show_menu(): popup.win.refresh() - cursor.handle_key(control.key_input()) + cursor.handle_key(nyx.curses.key_input()) # redraws the rest of the interface if we're rendering on it again diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 45f82a8..5b8a636 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -213,7 +213,7 @@ class ConfigPanel(nyx.panel.Panel): popup.addstr(0, 0, 'Torrc to save:', HIGHLIGHT) popup.win.refresh() - key = nyx.controller.get_controller().key_input() + key = nyx.curses.key_input() if key.match('left'): selection = max(0, selection - 1) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 2b3714e..257716e 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -480,7 +480,7 @@ class GraphPanel(nyx.panel.Panel): while True: msg = 'press the down/up to resize the graph, and enter when done' control.set_msg(msg, BOLD, True) - key = control.key_input() + key = nyx.curses.key_input() if key.match('down'): # don't grow the graph if it's already consuming the whole display diff --git a/nyx/popups.py b/nyx/popups.py index e6df000..61273f3 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -111,7 +111,7 @@ def show_msg(msg, max_wait = None, attr = HIGHLIGHT): control = nyx.controller.get_controller() control.set_msg(msg, attr, True) - key_press = control.key_input(max_wait) + key_press = nyx.curses.key_input(max_wait) control.set_msg() return key_press @@ -176,7 +176,7 @@ def show_help_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - exit_key = control.key_input() + exit_key = nyx.curses.key_input() if not exit_key.is_selection() and not exit_key.is_scroll() and \ not exit_key.match('left', 'right'): @@ -192,8 +192,6 @@ def show_about_popup(): with popup_window(9, 80) as (popup, _, height): if popup: - control = nyx.controller.get_controller() - popup.win.box() popup.addstr(0, 0, 'About:', HIGHLIGHT) popup.addstr(1, 2, 'nyx, version %s (released %s)' % (__version__, __release_date__), BOLD) @@ -203,7 +201,7 @@ def show_about_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - control.key_input() + nyx.curses.key_input() def show_count_dialog(title, counts): @@ -250,7 +248,7 @@ def show_count_dialog(title, counts): popup.addstr(0, 0, title, HIGHLIGHT) popup.win.refresh() - nyx.controller.get_controller().key_input() + nyx.curses.key_input() def show_sort_dialog(title, options, old_selection, option_colors): @@ -304,7 +302,7 @@ def show_sort_dialog(title, options, old_selection, option_colors): popup.win.refresh() - key = nyx.controller.get_controller().key_input() + key = nyx.curses.key_input() if key.match('left'): cursor_location = max(0, cursor_location - 1) @@ -405,7 +403,7 @@ def show_menu(title, options, old_selection): popup.win.refresh() - key = control.key_input() + key = nyx.curses.key_input() if key.match('up'): selection = max(0, selection - 1) @@ -457,7 +455,7 @@ def show_descriptor_popup(fingerprint, color, max_width, is_close_key): _draw(popup, title, lines, color, scroller.location(), show_line_numbers) redraw = False - key = nyx.controller.get_controller().key_input() + key = nyx.curses.key_input() if key.is_scroll(): redraw = scroller.handle_key(key, len(lines), height - 2)

1 0

[nyx/master] Curses setup() function
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 505f4e623097d29fcc7361d375b8e11a411a4971 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 08:43:29 2016 -0700 Curses setup() function Moving our one-time curses setup to the nyx.curses module. --- nyx/controller.py | 18 +++--------------- nyx/curses.py | 22 ++++++++++++++++++++++ nyx/menu/menu.py | 2 +- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 9a75f60..54508aa 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -102,7 +102,7 @@ class Controller: top to bottom on the page. Arguments: - stdscr - curses window + stdscr - curses window """ self._screen = stdscr @@ -381,7 +381,7 @@ def start_nyx(stdscr): Main draw loop context. Arguments: - stdscr - curses window + stdscr - curses window """ global NYX_CONTROLLER @@ -403,19 +403,7 @@ def start_nyx(stdscr): for panel_impl in control.get_daemon_panels(): panel_impl.start() - # allows for background transparency - - try: - curses.use_default_colors() - except curses.error: - pass - - # makes the cursor invisible - - try: - curses.curs_set(0) - except curses.error: - pass + nyx.curses.setup(transparent_background = True, cursor = False) # logs the initialization time diff --git a/nyx/curses.py b/nyx/curses.py index 18da7f2..fa2a77c 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -9,6 +9,7 @@ if we want Windows support in the future too. :: curses_attr - curses encoded text attribute + setup - configures curses settings is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -151,6 +152,27 @@ def curses_attr(*attributes): return encoded +def setup(transparent_background = False, cursor = True): + """ + One time setup operations for configuring curses. + + :param bool transparent_background: allows background transparency + :param bool cursor: makes cursor visible + """ + + if transparent_background: + try: + curses.use_default_colors() + except curses.error: + pass + + if not cursor: + try: + curses.curs_set(0) + except curses.error: + pass + + def is_color_supported(): """ Checks if curses currently supports rendering colors. diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index df7d499..1deab02 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -113,7 +113,7 @@ def show_menu(): draw_label = ' %s ' % top_level_item.get_label()[1] popup.addstr(0, draw_left, draw_label, BOLD, attr) - popup.addch(0, draw_left + len(draw_label), curses.ACS_VLINE) + popup.vline(0, draw_left + len(draw_label), 1) draw_left += len(draw_label) + 1

1 0

[nyx/master] Perform cbreak in key_input()
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit b552c4ef7f8a1a64378652c785cef0d8e04c93b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 08:58:29 2016 -0700 Perform cbreak in key_input() Our cbreak and halfdelay modes are used to determine if we time out requests for user input... https://www.ibm.com/support/knowledgecenter/ssw_aix_53/com.ibm.aix.genprogc… As such we might as well have this live in the one spot we call the curses getch() method. This was only scattered around due to old copy-pasted code. --- nyx/controller.py | 12 +++++++++--- nyx/menu/menu.py | 5 ----- nyx/panel/graph.py | 2 -- nyx/popups.py | 20 +++----------------- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 54508aa..e3bb354 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -146,11 +146,18 @@ class Controller: return self._screen - def key_input(self): + def key_input(self, input_timeout = None): """ Gets keystroke from the user. + + :param int input_timeout: duration in seconds to wait for user input """ + if input_timeout: + curses.halfdelay(input_timeout * 10) + else: + curses.cbreak() # wait indefinitely for key presses (no timeout) + return nyx.curses.KeyInput(self.get_screen().getch()) def get_page_count(self): @@ -431,8 +438,7 @@ def start_nyx(stdscr): if override_key: key, override_key = override_key, None else: - curses.halfdelay(CONFIG['features.redrawRate'] * 10) - key = nyx.curses.KeyInput(stdscr.getch()) + key = control.key_input(CONFIG['features.redrawRate']) if key.match('right'): control.next_page() diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 1deab02..7d49b3e 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -2,10 +2,6 @@ Display logic for presenting the menu. """ -from __future__ import absolute_import - -import curses - import nyx.curses import nyx.popups import nyx.controller @@ -123,7 +119,6 @@ def show_menu(): popup.win.refresh() - curses.cbreak() cursor.handle_key(control.key_input()) # redraws the rest of the interface if we're rendering on it again diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 818769c..2b3714e 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -13,7 +13,6 @@ Downloaded (0.0 B/sec): Uploaded (0.0 B/sec): import collections import copy -import curses import time import nyx.controller @@ -481,7 +480,6 @@ class GraphPanel(nyx.panel.Panel): while True: msg = 'press the down/up to resize the graph, and enter when done' control.set_msg(msg, BOLD, True) - curses.cbreak() # TODO: can we drop this? key = control.key_input() if key.match('down'): diff --git a/nyx/popups.py b/nyx/popups.py index 70db69a..e6df000 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -2,10 +2,7 @@ Functions for displaying popups in the interface. """ -from __future__ import absolute_import - import math -import curses import operator import nyx.controller @@ -99,14 +96,14 @@ def input_prompt(msg, initial_value = ''): return user_input -def show_msg(msg, max_wait = -1, attr = HIGHLIGHT): +def show_msg(msg, max_wait = None, attr = HIGHLIGHT): """ Displays a single line message on the control line for a set time. Pressing any key will end the message. This returns the key pressed. Arguments: msg - message to be displayed to the user - max_wait - time to show the message, indefinite if -1 + max_wait - time to show the message, indefinite if None attr - attributes with which to draw the message """ @@ -114,12 +111,7 @@ def show_msg(msg, max_wait = -1, attr = HIGHLIGHT): control = nyx.controller.get_controller() control.set_msg(msg, attr, True) - if max_wait == -1: - curses.cbreak() - else: - curses.halfdelay(max_wait * 10) - - key_press = control.key_input() + key_press = control.key_input(max_wait) control.set_msg() return key_press @@ -184,7 +176,6 @@ def show_help_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - curses.cbreak() exit_key = control.key_input() if not exit_key.is_selection() and not exit_key.is_scroll() and \ @@ -212,7 +203,6 @@ def show_about_popup(): popup.addstr(7, 2, 'Press any key...') popup.win.refresh() - curses.cbreak() control.key_input() @@ -260,7 +250,6 @@ def show_count_dialog(title, counts): popup.addstr(0, 0, title, HIGHLIGHT) popup.win.refresh() - curses.cbreak() nyx.controller.get_controller().key_input() @@ -288,7 +277,6 @@ def show_sort_dialog(title, options, old_selection, option_colors): if popup: new_selections = [] # new ordering cursor_location = 0 # index of highlighted option - curses.cbreak() # wait indefinitely for key presses (no timeout) selection_options = list(options) selection_options.append('Cancel') @@ -403,8 +391,6 @@ def show_menu(title, options, old_selection): top_panel.set_title_visible(False) top_panel.redraw(True) - curses.cbreak() # wait indefinitely for key presses (no timeout) - while True: popup.win.erase() popup.win.box()

1 0

[nyx/master] Replace nyx.curses.setup() with start()
by atagar＠torproject.org 15 Mar '16

15 Mar '16

commit 731cfe8745b8dc631497974888c38b8bdadf9ae7 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 15 09:53:07 2016 -0700 Replace nyx.curses.setup() with start() No reason not to have this replace curses.wrapper() too. This way we can drop direct curses usage from our starter as well. --- nyx/controller.py | 2 -- nyx/curses.py | 41 +++++++++++++++++++++++++++-------------- nyx/starter.py | 5 +---- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index e3bb354..7b96134 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -410,8 +410,6 @@ def start_nyx(stdscr): for panel_impl in control.get_daemon_panels(): panel_impl.start() - nyx.curses.setup(transparent_background = True, cursor = False) - # logs the initialization time log.info('nyx started (initialization took %0.3f seconds)' % (time.time() - CONFIG['start_time'])) diff --git a/nyx/curses.py b/nyx/curses.py index fa2a77c..a2d0dfa 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -9,7 +9,7 @@ if we want Windows support in the future too. :: curses_attr - curses encoded text attribute - setup - configures curses settings + start - initializes curses with the given function is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -72,6 +72,8 @@ import stem.util.system from nyx import msg, log +CURSES_SCREEN = None + # Text colors and attributes. These are *very* commonly used so including # shorter aliases (so they can be referenced as just GREEN or BOLD). @@ -152,25 +154,36 @@ def curses_attr(*attributes): return encoded -def setup(transparent_background = False, cursor = True): +def start(function, transparent_background = False, cursor = True): """ - One time setup operations for configuring curses. + Starts a curses interface, delegating to the given function. The function + should accept a single argument for the curses screen. + :param funtion: function to invoke when curses starts :param bool transparent_background: allows background transparency :param bool cursor: makes cursor visible """ - if transparent_background: - try: - curses.use_default_colors() - except curses.error: - pass - - if not cursor: - try: - curses.curs_set(0) - except curses.error: - pass + def _wrapper(stdscr): + global CURSES_SCREEN + + CURSES_SCREEN = stdscr + + if transparent_background: + try: + curses.use_default_colors() + except curses.error: + pass + + if not cursor: + try: + curses.curs_set(0) + except curses.error: + pass + + function(stdscr) + + curses.wrapper(_wrapper) def is_color_supported(): diff --git a/nyx/starter.py b/nyx/starter.py index 6697e21..09f5057 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -4,9 +4,6 @@ information. This starts the application, parsing arguments and getting a Tor connection. """ -from __future__ import absolute_import - -import curses import locale import logging import os @@ -86,7 +83,7 @@ def main(config): _set_process_name() try: - curses.wrapper(nyx.controller.start_nyx) + nyx.curses.start(nyx.controller.start_nyx, transparent_background = True, cursor = False) except UnboundLocalError as exc: if os.environ['TERM'] != 'xterm': print(msg('setup.unknown_term', term = os.environ['TERM']))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2016