Merge branch 'master' into jury-moderation

.github/workflows/deploy.pulls.dev.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Checkout git repository
         uses: actions/checkout@v3
         with:
-          ref: master
+          ref: ${{ github.ref }}
           fetch-depth: 0 # We need a complete history for merging branches
       - uses: andyoknen/combine-pull-requests@v1
         with:
@@ -53,6 +53,7 @@ jobs:
           tar xzf repo.tgz
           rm -rf repo.tgz
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon -- -sha=${{ github.sha }} -run=${{ github.run_number }}${{ github.run_attempt }}
       - name: Copy to dest dir
         run: rsync -ah --exclude={'.git','.gitignore','.github','package.json','package-lock.json','minimize.json','node_modules','.well-known','assets','proxy16','cordova','res','build'} ./ /docker/pre/
@@ -74,6 +75,7 @@ jobs:
           tar xzf repo.tgz
           rm -rf repo.tgz
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon:test -- -sha=${{ github.sha }} -run=${{ github.run_number }}${{ github.run_attempt }}
       - name: Copy to dest dir
         run: rsync -ah --exclude={'.git','.gitignore','.github','package.json','package-lock.json','minimize.json','node_modules','.well-known','assets','proxy16','cordova','res','build'} ./ /docker/gui/

.github/workflows/deploy.web.yml

@@ -18,6 +18,7 @@ jobs:
       - name: Prepare
         run: |
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon -- -sha=${{ github.sha }}
         
       - name: Prepare archive

.github/workflows/night.bastyon.com.yml

@@ -51,6 +51,7 @@ jobs:
           tar xzf repo.tgz
           rm -rf repo.tgz
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon -- -sha=${{ github.sha }}
       - name: Copy to dest dir
         run: rsync -ah --exclude={'.git','.gitignore','.github','package.json','package-lock.json','minimize.json','node_modules','.well-known','assets','proxy16','cordova','res','build'} ./ /docker/night/

.github/workflows/night.test.bastyon.com.yml

@@ -20,6 +20,7 @@ jobs:
       - name: Prepare
         run: |
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon:test -- -sha=${{ github.sha }}
       - name: Copy to dest dir
         run: rsync -ah --exclude={'.git','.gitignore','.github','package.json','package-lock.json','minimize.json','node_modules','.well-known','assets','proxy16','cordova','res','build'} ./ /docker/night.test/

.github/workflows/pre.pocketnet.app.yml

@@ -19,6 +19,7 @@ jobs:
       - name: Prepare
         run: |
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon -- -sha=${{ github.sha }}
 
       - name: Copy to dest dir

.github/workflows/test.pocketnet.app.yml

@@ -19,6 +19,7 @@ jobs:
       - name: Prepare
         run: |
           npm i
+          npm run build:proxy16
           npm run minimize:bastyon:test -- -sha=${{ github.sha }}
 
       - name: Copy to dest dir

.gitignore

@@ -66,4 +66,6 @@ posts/
 ./main.js
 cordova/cert.keystore
 package.cordova.json
-dcs
+dcs
+/proxy16/peertube-servers.json
+peertube-servers.json

components/footer/templates/index.html

@@ -7,7 +7,7 @@
                      <div class="logoWrapper">
 
                         <div class="icon">
-                            <img class="footer_logo" src="img/logotypes/<%-app.meta.fullname.toLowerCase()%>_logo_black.svg">
+                            <img class="footer_logo onlylight" src="img/logotypes/<%-app.meta.fullname.toLowerCase()%>_logo_black.svg">
                         </div>
 
                     </div>

components/lenta/index.js

@@ -1535,7 +1535,7 @@ var lenta = (function(){
 
 					//players[id].p.muted = false
 
-					actions.setVolume(players[id], videosVolume || 0.5)
+					actions.setVolume(players[id], videosVolume || 1)
 			},
 
 			opensvi : function(id){
@@ -4159,7 +4159,7 @@ var lenta = (function(){
 
 					if(s.settings.v != "a"){
 
-						if((mw || essenseData.openapi) && image.images.length > 1 ){
+						if((mw) && image.images.length > 1 ){
 
 							_.each(image.images, function(img, n){
 								var _img = img.img;
@@ -4187,7 +4187,7 @@ var lenta = (function(){
 
 								var ac = '';
 
-								var _w = mw ? self.app.width : el.width() || el.closest('.share').width();
+								var _w = mw && !essenseData.openapi ? self.app.width : el.width() || el.closest('.share').width();
 								var _h = el.height()
 
 
@@ -4661,6 +4661,10 @@ var lenta = (function(){
 
 				}
 
+				allshares = _.uniq(allshares, (s) => {
+					return s.txid
+				})
+
 				var author = essenseData.author;
 
 				self.app.platform.sdk.node.shares.loadvideoinfoifneed(allshares, video, function(){

components/menu/templates/index.html

@@ -38,7 +38,7 @@
 								<div class="item  sitename" >
 									<div elementsid="eventssitename" class="icon" events="sitename">
 
-										<img class="header_logo all" src="img/logotypes/<%-app.meta.fullname.toLowerCase()%>_logo_<%-theme%>.svg">
+										<img class="header_logo onlylight all" src="img/logotypes/<%-app.meta.fullname.toLowerCase()%>_logo_<%-theme%>.svg">
 
 									</div>
 									<div elementsid="eventslang" class="label">

components/post/index.js

@@ -1832,7 +1832,7 @@ var post = (function () {
 
 							var info = app.platform.sdk.videos.storage[share.url]
 
-							if (info){
+							if (info && info.data){
 								if (info.data.isLive){
 									_p.el.find('.statswrapperExtended .number').html(info.data.viewers || 0)
 

components/registration/index.js

@@ -12,7 +12,6 @@ var registration = (function(){
 		var el = {}, k = {},  gliperror = false, essenseData, initialParameters, ext = null;
 
 		var addresses = [];
-
 
 		var categoryIcons = [
 			{
@@ -101,6 +100,8 @@ var registration = (function(){
 		var current = null;
 		var regproxy = null;
 
+		var subscribe = []
+
 		var getproxyoptions = function(){
 
 			if(regproxy){
@@ -216,7 +217,6 @@ var registration = (function(){
 					"PCx1LKWdV1pc6TmKwYU8vqEn3CpAeTexDr",
 					"PPw4k3Zra7tYRM643QVm3V4UFrcZZb9H6H"
 				],
-
 				test : [
 					'TEgrDd5Arx9fLPk8gcyr1XLL1GU6dkhHLi',
 					'TEcigdCKLj47Rb4Ek5CL7N1N3LpkPZh5pu',
@@ -237,6 +237,18 @@ var registration = (function(){
 				]
 			}
 
+			_.each(window.project_config.regAccounts || [], (a) => {
+				_.each(dict, (d, k) => {
+
+					if(k == 'test') return
+
+					dict[k].unshift({
+						a : a,
+						s : true
+					})
+				})
+			})
+
 			return (self.app.test ? dict.test : (dict[self.app.localization.key] || [])) || []
 
 		}
@@ -270,6 +282,8 @@ var registration = (function(){
 
 					//self.app.platform.sdk.theme.set('black')
 
+
+
 
 					clbk()
 				},
@@ -451,18 +465,39 @@ var registration = (function(){
 
 				prev : function(clbk){
 
-					//self.app.platform.sdk.theme.set('black')
+					var bloggers = getbloggers()
+
+					var addresses = _.map(bloggers, (v) => {
+
+						if(_.isObject(v)){
 
-					var adresses = getbloggers()
+							if(v.s) {
+								subscribe.push(v.a)
+								subscribe = _.uniq(subscribe)
+							}
+
+							return v.a
+						}
+
+						return v
+
+					})
+
+					self.sdk.users.get(addresses, function(data){
 
-					self.sdk.users.get(getbloggers(), function(data){
+						steps.bloggers.current = _.shuffle(self.psdk.userInfo.gets(addresses))
 
-						steps.bloggers.current = _.shuffle(self.psdk.userInfo.gets(adresses))
+						steps.bloggers.current = _.sortBy(steps.bloggers.current, (u) => {
+							if(_.indexOf(subscribe, u.address) > -1){
+								return 1
+							}
+
+							return 2
+						})
 
 						if (steps.bloggers.current.length){
 
 							clbk()
-							//addresses = data;
 						}
 						else{
 							actions.to('categories')
@@ -541,6 +576,26 @@ var registration = (function(){
 
 					class : 'zindex',
 
+					success : function(){
+
+						subscribe = _.filter(subscribe, (a) => {
+							return a != address
+						})
+
+						el.c.find('.user[address="'+address+'"] .subscribeWrapper').removeClass('following');
+
+						if(clbk) clbk()
+
+					}
+				})
+
+				/*dialog({
+					html : self.app.localization.e('e13022'),
+					btn1text : self.app.localization.e('unsub'),
+					btn2text :  self.app.localization.e('ucancel'),
+
+					class : 'zindex',
+
 					success : function(){
 
 						self.app.platform.api.actions.unsubscribe(address, function(tx, err){
@@ -560,13 +615,20 @@ var registration = (function(){
 						})
 
 					}
-				})
-
+				})*/
 
 			},
 			subscribe : function(address, clbk){
 
-				self.app.platform.api.actions.notificationsTurnOn(address, function(tx, err){
+				subscribe.push(address)
+
+				subscribe = _.uniq(subscribe)
+
+				el.c.find('.user[address="'+address+'"] .subscribeWrapper').addClass('following')
+
+				if(clbk) clbk()
+
+				/*self.app.platform.api.actions.notificationsTurnOn(address, function(tx, err){
 
 					if(tx){
 
@@ -581,10 +643,22 @@ var registration = (function(){
 						clbk();
 					}
 
-				})
+				})*/
 
 			},
 
+			subscribeList : function(){
+
+				if(!subscribe.length) return
+
+				_.each(subscribe, (address) => {
+					self.app.platform.api.actions.notificationsTurnOn(address, function(tx, err){
+					})
+				})
+
+				subscribe = []
+			},
+
 			preloader : function(sh){
 				window.requestAnimationFrame(() => {
 					if(sh){
@@ -880,7 +954,8 @@ var registration = (function(){
 					name :  'bloggers',
 					el :   el,
 					data : {
-						addresses: steps.bloggers.current
+						addresses: steps.bloggers.current,
+						subscribe : subscribe
 					},
 
 				}, function(_p){
@@ -1107,6 +1182,8 @@ var registration = (function(){
 
 				k = {}
 
+				subscribe = []
+
 				essenseData = deep(p, 'settings.essenseData') || {}
 
 				current = null;
@@ -1150,6 +1227,8 @@ var registration = (function(){
 			destroy : function(){
 				//window.removeEventListener('resize', events.width)
 
+				actions.subscribeList()
+
 				self.app.el.app.removeClass('default-scroll')
 
 				delete self.app.platform.sdk.node.transactions.clbks.moneyfail
@@ -1171,7 +1250,7 @@ var registration = (function(){
 
 				essenseData = {}
 
-				self.app.platform.ui.showkeyafterregistration()
+				//self.app.platform.ui.showkeyafterregistration()
 
 			},
 

components/registration/templates/bloggers.html

@@ -24,6 +24,8 @@
 			var r = u.reputation;
 
 			if (me && me.relation(address, 'subscribes')){ _class="following" };
+
+			if(typeof subscribe != "undefined" && _.indexOf(subscribe, address) > -1) { _class="following" };
 
 			if (me && me.relation(address, 'blocking')){ _class="blocking" };
 

components/share/index.js

@@ -1602,6 +1602,8 @@ var share = (function(){
 
 				self.app.platform.sdk.ustate.me(function(_mestate){
 
+					console.log('_mestate' , _mestate)
+
 					self.shell({
 						name :  'postline',
 						el : el.postline,

components/share/templates/postline.html

@@ -44,7 +44,7 @@
                         <div elementsid="peertubeAddVideo" class="item peertube tooltip nowidth" embeding="addVideo" title="<%=e('peertubeAddVideo')%>">
                             <i class="fas fa-video"></i> <span class="mobiledevice"><%- e('peertubeAddVideo') %></span>
                         </div>
-                        <% if ((( typeof u != 'undefined' && (Object.values(u).includes('shark'))) || app.platform.istest(app.user.address.value) || app.test || app.platform.ui.usertype(app.user.address.value)) && !isTablet()) {%>
+                        <% if ((( typeof u != 'undefined' && (_.indexOf(u.badges || [], 'shark') > -1) || app.platform.istest(app.user.address.value) || app.test || app.platform.ui.usertype(app.user.address.value)) && !isTablet())) {%>
                             <div elementsid="peertubeAddStream" class="item peertube tooltip nowidth" embeding="addStream" title="<%=e('peertubeAddStream')%>">
                                 <i class="fas fa-dot-circle"></i> <span class="mobiledevice"><%- e('peertubeAddStream') %></span>
                             </div>

components/share/templates/url.html

@@ -267,14 +267,14 @@
 						<% if(og.title || og.titlePage) {%>
 							<a elementsid="titlehref" href="<%= findAndReplaceLinkClear(url) %>" donottrust="true">
 								<div class="title">
-									<%- truncateString(og.title || og.titlePage, 100) %>
+									<%= truncateString(superXSS(og.title || og.titlePage), 100) %>
 								</div>
 							</a>
 						<% } %>
 
 						<% if(og.description || og.descriptionPage) {%>
 							<a elementsid="descriptionhref" href="<%= findAndReplaceLinkClear(url) %>" donottrust="true">
-								<div class="description"><%- truncateString(og.description || og.descriptionPage, 100) %></div>
+								<div class="description"><%= truncateString(superXSS(og.description || og.descriptionPage), 100) %></div>
 							</a>
 						<% } %>
 					</div>