v2.0.9

Author: peter

README.md

@@ -8,6 +8,8 @@
 
 ### [The latest 最新版 v2.0.8](https://github.com/QTGate/QTGate-Desktop-Client/releases/latest/)
 
+[Android, 安卓](https://github.com/QTGate/CoNETPlatform-Android)
+
 [windows32](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v2.0.8/CoNET.Setup.2.0.8.ia32.exe)
 
 [windows64](https://github.com/QTGate/QTGate-Desktop-Client/releases/download/v2.0.8/CoNET.Setup.2.0.8.exe)

app/CoNET.d.ts

@@ -418,6 +418,9 @@ interface twitter_post {
     truncated: boolean
     user: Twitter_verify_credentials
     tweetCountSummary: tweetCountSummary
+    showUser: KnockoutObservable < boolean >
+    CoNET_totalTwitter: number
+    CoNET_currentTwitter: number
 }
 
 

app/localWebServer.ts

@@ -215,7 +215,7 @@ export default class localServer {
 
 	private sendRequest ( socket: SocketIO.Socket, cmd: QTGateAPIRequestCommand, CallBack ) {
 		if ( !this.openPgpKeyOption) {
-			console.log ( `sendrequest keypair error! !this.config [${ !this.config }] !this.keyPair[${ !this.keyPair }] !this.keyPair.passwordOK [${ !this.keyPair.passwordOK }]`)
+			console.log ( `sendrequest keypair error! !this.config [${ !this.config }] !this.keyPair[${ !this.keyPair }]`)
 			return CallBack (1)
 		}
 		if ( !this.CoNETConnectCalss ) {
@@ -420,22 +420,16 @@ export default class localServer {
 			CallBack1()
 			saveLog (`on checkActiveEmailSubmit`)
 			if ( ! text || ! text.length || !/^-----BEGIN PGP MESSAGE-----/.test ( text )) {
-				socket.emit  ('checkActiveEmailSubmit', 0 )
+				socket.emit  ( 'checkActiveEmailSubmit', 0 )
 				return saveLog ( `checkActiveEmailSubmit, no text.length ! [${ text }]` )
 			}
 
-			if ( text.indexOf ('-----BEGIN PGP MESSAGE----- Version: GnuPG v1 ') > -1 ) {
-                text = text.replace (/-----BEGIN PGP MESSAGE----- Version: GnuPG v1 /,'-----BEGIN__PGP__MESSAGE-----\r\nVersion:__GnuPG__v1\r\n\r\n')
-                text = text.replace (/-----END PGP MESSAGE-----/, '-----END__PGP__MESSAGE-----')
-                text = text.replace (/ /g, '\r\n')
-                text = text.replace ( /__/g, ' ')
-            }
-
 
 			return Tool.decryptoMessage ( this.openPgpKeyOption, text, ( err, data ) => {
 				if ( err ) {
 					socket.emit  ('checkActiveEmailSubmit', 1 )
-					return saveLog ( `checkActiveEmailSubmit, decryptoMessage error [${ err.message ? err.message : null }]` )
+
+					return saveLog ( `checkActiveEmailSubmit, decryptoMessage error [${ err.message ? err.message : null }]\n${text}` )
 				}
 				let pass = null
 				try {
@@ -1311,6 +1305,7 @@ export default class localServer {
 
 
 			this.listenAfterTwitterLogin ( socket )
+
 			if ( this.twitterDataInit ) {
 				return socket.emit ( 'password', null, this.twitterData )
 			}
@@ -1359,6 +1354,8 @@ export default class localServer {
 
 	}
 
+	
+
 	constructor( private cmdResponse: ( cmd: QTGateAPIRequestCommand ) => void, test: boolean ) {
 
 		this.expressServer.set ( 'views', Path.join ( __dirname, 'views' ))
@@ -1373,8 +1370,15 @@ export default class localServer {
 		})
 
 		this.expressServer.get ( '/twitter', ( req, res ) => {
-			console.log (`get twitter`)
-            res.render( 'twitter', { title: 'CoNET for Twitter' })
+			console.log ( `get twitter`)
+			if ( !this.config.keypair || !this.config.keypair.publicKey || !this.CoNETConnectCalss ) {
+				
+				return res.render( 'home', { title: 'home', proxyErr: false  })
+				
+			}
+			
+			res.render( 'twitter', { title: 'CoNET for Twitter' })
+			
 		})
 
 		this.expressServer.get ( '/proxyErr', ( req, res ) => {

app/public/css/page.css

@@ -109,9 +109,10 @@ body {
 	margin: 3em;
 }
 .CoContent {
-    width: 100%;
+    width: 95%;
     position: relative;
-    transition: opacity 0.4s ease-in;
+		transition: opacity 0.4s ease-in;
+		margin: auto;
 }
 .loginCards {
 	margin: 0px auto!important;
@@ -401,6 +402,10 @@ ul.plan-features {
 	 max-width:530px;
    }
  }
+
+
+
+
  .flapLeft, .flapeRight {
    position: relative;
    cursor: pointer;

app/public/scripts/CoGate.ts

@@ -358,7 +358,7 @@ class CoGateClass {
 			})
 		})
 
-		socketIo.on ( 'QTGateGatewayConnectRequest', function ( err, cmd: IConnectCommand[],  ) {
+		socketIo.on ( 'QTGateGatewayConnectRequest', function ( err, cmd: IConnectCommand,  ) {
 
 			if ( ! self.CoGateRegion() ) {
 				let uuu: coGateRegion = null

app/public/scripts/imapForm.ts

@@ -181,15 +181,21 @@ class keyPairSign {
 			} else {
 				self.conformButtom ( true )
 			}
-
 		})
 	}
 
 	public checkActiveEmailSubmit () {
 		const self = this
 		this.conformTextError ( false )
 		this.activeing ( true )
-		return socketIo.emit11 ( 'checkActiveEmailSubmit', this.conformText(), function ( err, req: QTGateAPIRequestCommand ) {
+		
+		let text = this.conformText()
+		if ( / /.test ( text )) {
+			text = text.replace (/ PGP MESSAGE/g, '__PGP__MESSAGE').replace (/ /g, '\r\n').replace (/__/g, ' ')
+			text = text.replace (/ MESSAGE-----/,' MESSAGE-----\r\n')
+		}
+		
+		return socketIo.emit11 ( 'checkActiveEmailSubmit', text, function ( err, req: QTGateAPIRequestCommand ) {
 			self.activeing ( false )
 			if ( err !== null && err > -1 || req && req.error != null && req.error > -1 ) {
 				self.conformTextErrorNumber ( err !== null && err > -1 ? err :

app/public/scripts/twitter.ts

@@ -444,6 +444,7 @@ module twitter_layout {
             if ( index > -1 ) {
                 this.currentTimelines.splice ( index, 1 )
             }
+            data.showUser = ko.observable ( false )
             data.QTGate_created_at = ko.computed( function () {
                 return getTimeFromCreate( data.created_at, self )
             })
@@ -490,6 +491,7 @@ module twitter_layout {
             data.favoritedLoader_ko = ko.observable ( false )
             this.currentTimelines.push ( data )
             $('.row.ui.shape').shape()
+            $('.ui.sidebar.twitterTimes').sidebar('toggle')
             return this.currentTimelines.sort ( function ( a, b ) {
                 return b.id - a.id
             })

app/tools/initSystem.ts

@@ -826,7 +826,7 @@ export const testPing = ( hostIp: string, CallBack ) => {
 
 			session.close ()
 			if ( err ) {
-				console.log (`session.pingHost ERROR, ${ err.message }`)
+				console.log ( `session.pingHost ERROR, ${ err.message }`)
 				return next ( err )
 			}
 			const ping = rcvd.getTime () - sent.getTime ()

app/views/home/index.pug

@@ -273,8 +273,8 @@ block jumbotron1
 			<!-- /ko -->
 			//-	if: CoNETConnect
 	<!-- /ko -->
-	
-	section.CoContent.content( data-bind = " if: CoGate()" style = "margin-top: 4em;")
+	<!-- ko if: CoGate -->
+	section.CoContent.content( style = "margin-top: 4em;")
 		<!-- ko if: CoGateClass -->
 		<!-- ko with: CoGateClass -->
 		<!-- ko if: showCards && ! CoGateAccount() && !CoGateRegion() -->
@@ -838,7 +838,7 @@ block jumbotron1
 
 		<!-- /ko -->
 		<!-- /ko -->
-	
+	<!-- /ko -->
 	//-		AppList 
 	<!-- ko if:  AppList() && !CoGate() && keyPair() && keyPair().verified -->
 	section.AppList.CoContent.content