Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

patch: transferring configs to files, update package.json #1176

Merged
merged 33 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2595a78
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 13, 2023
cec91af
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 15, 2023
bc99951
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 15, 2023
2d97476
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 15, 2023
0ebf487
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 18, 2023
ca3b129
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 21, 2023
ab4772e
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 25, 2023
9db1d8f
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 27, 2023
e593b25
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 27, 2023
b2d702f
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Nov 28, 2023
2bc6076
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Dec 6, 2023
b05d4f2
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Dec 25, 2023
fb94455
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Dec 26, 2023
9f55538
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Dec 29, 2023
13df5e6
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jan 8, 2024
8c69654
v
maxgithubprofile Jan 11, 2024
e8d3d59
v
maxgithubprofile Jan 11, 2024
9a3cbdb
v
maxgithubprofile Jan 12, 2024
48f9db3
v
maxgithubprofile Jan 17, 2024
c718a0a
update packages
maxgithubprofile Jan 22, 2024
ccced61
v
maxgithubprofile Jan 22, 2024
07e187f
Critical vulnerabilities in Nedb
shpingalet007 Jan 22, 2024
ff17d3c
Html minifier module missing fix
shpingalet007 Jan 22, 2024
88a891a
Dmg license module missing fix
shpingalet007 Jan 22, 2024
a857b22
Nedb module missing in root package fix
shpingalet007 Jan 22, 2024
eaa2b40
Nedb deprecated constructor parameters fix
shpingalet007 Jan 22, 2024
b9c42b6
Axios module missing in root package fix
shpingalet007 Jan 22, 2024
6b921f9
Merge branch '0801-brtrn' of https://github.com/pocketnetteam/pocketn…
maxgithubprofile Jan 23, 2024
1eb0c61
v
maxgithubprofile Jan 23, 2024
ae4c61a
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jan 23, 2024
d753006
Merge branch 'master' into 0801-brtrn
maxgithubprofile Jan 23, 2024
28ab32b
Update package-lock.json
maxgithubprofile Jan 23, 2024
fbc28b3
Update common.json
maxgithubprofile Jan 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 63 additions & 49 deletions chat/matrix-element.11.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.11.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.11.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.11.min.js.map

Large diffs are not rendered by default.

87 changes: 44 additions & 43 deletions chat/matrix-element.7.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.7.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.7.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.7.min.js.map

Large diffs are not rendered by default.

131 changes: 67 additions & 64 deletions chat/matrix-element.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.js.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions chat/matrix-element.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.min.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions components/applications/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ var applications = (function(){
return !ed.filter || ed.filter(os)
})

filtered = _.filter(filtered, function(os){
return os.github || os.href
})

if(window.cordova && isios()){
filtered = _.filter(filtered, (f) => {
return f.id == 'macos' || f.id == 'ios'
Expand Down
2 changes: 1 addition & 1 deletion components/authorn/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
white-space: nowrap;
scroll-snap-type: x mandatory;
overflow-x: scroll;
scrollbar-width: 0px;
scrollbar-width: none;
}
#authorn .alentanavigation .navi .naviscrollwrapper::-webkit-scrollbar {
width: 0;
Expand Down
2 changes: 1 addition & 1 deletion components/authorn/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
white-space: nowrap;
scroll-snap-type: x mandatory;
overflow-x: scroll;
scrollbar-width: 0px;
scrollbar-width: none;

&::-webkit-scrollbar{
width: 0;
Expand Down
17 changes: 4 additions & 13 deletions components/comments/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,10 @@ var comments = (function(){

id || (id = '0')

console.log("value", v, findAndReplaceLinkClearReverse(v.replace('⠀', ' ')))

if (currents[id])
currents[id].message.set(v.replace('⠀', ' '))
currents[id].message.set(findAndReplaceLinkClearReverse(v.replace('⠀', ' ')))

state.save()

Expand Down Expand Up @@ -2696,13 +2698,11 @@ var comments = (function(){

self.app.platform.actionListeners[eid] = function({type, alias, status}){




if(type == 'comment'){
var comment = alias

if (comment.postid == txid){
if(currents[comment.id]) return

clbks.post(self.psdk.comment.get(comment.id) || comment, comment.optype)

Expand All @@ -2720,15 +2720,6 @@ var comments = (function(){
}
}

/*if (alias.postid == share.txid){
clbks.upvote(null, data.comment, data.upvoteVal || data.value, data.addrFrom)
}*/

/*var share = _.find(sharesInview, (share) => share.txid == alias.share)

if (share){
renders.stars(share)
}*/
}

}
Expand Down
2 changes: 2 additions & 0 deletions components/lenta/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4303,6 +4303,8 @@ var lenta = (function(){

sstuff : function(shares, error, pr, clbk, bshares, includingsub){

console.log('rawshares2', shares)

if(!bshares) bshares = []

newsharescount = shares.length
Expand Down
7 changes: 7 additions & 0 deletions components/post/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1828,7 +1828,14 @@ var post = (function () {
) {
if (clbk) clbk();
} else {

console.log('url remote', url)

self.app.platform.sdk.remote.get(url, function (og) {

console.log('url remote', og)


if (og) {
renders.url(clbk);
} else {
Expand Down
9 changes: 5 additions & 4 deletions components/share/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ var share = (function(){

var text = el.eMessage[0].emojioneArea.getText();

text = text.split(findAndReplaceLinkClearReverse(l)).join('');
text = text.split(l).join('');


Expand All @@ -688,11 +689,11 @@ var share = (function(){


applyText : function(text){
currentShare.message.set(text);
currentShare.message.set(findAndReplaceLinkClearReverse(text));
},

caption : function(caption){
currentShare.caption.set(caption);
currentShare.caption.set(findAndReplaceLinkClearReverse(caption));
},

loadimage : function(url, callback){
Expand Down Expand Up @@ -2756,11 +2757,11 @@ var share = (function(){
}

if (essenseData.name) {
currentShare.caption.set(essenseData.name);
currentShare.caption.set(findAndReplaceLinkClearReverse(essenseData.name));
}

if (essenseData.description) {
currentShare.message.set(essenseData.description);
currentShare.message.set(findAndReplaceLinkClearReverse(essenseData.description));
}

if (essenseData.tags) {
Expand Down
6 changes: 3 additions & 3 deletions components/share/templates/url.html
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,15 @@

<div class="cnt">
<% if(og.title || og.titlePage) {%>
<a elementsid="titlehref" href="<%- url %>" donottrust="true">
<a elementsid="titlehref" href="<%= findAndReplaceLinkClear(url) %>" donottrust="true">
<div class="title">
<%- truncateString(og.title || og.titlePage, 100) %>
</div>
</a>
<% } %>

<% if(og.description || og.descriptionPage) {%>
<a elementsid="descriptionhref" href="<%- url %>" donottrust="true">
<a elementsid="descriptionhref" href="<%= findAndReplaceLinkClear(url) %>" donottrust="true">
<div class="description"><%- truncateString(og.description || og.descriptionPage, 100) %></div>
</a>
<% } %>
Expand All @@ -281,7 +281,7 @@
<div class="urlcnttable table">
<div class="linkcnt">
<span class="linkedstyle <%- (meta.type === 'peertube' && typeof remove === 'undefined') ? 'hidden' : '' %>">
<a elementsid="peertubehref" href="<%- url %>" cordovalink="_system" donottrust="true">
<a href="<%= findAndReplaceLinkClear(url) %>" cordovalink="_system" donottrust="true">
<%- url %>
</a>
</span>
Expand Down
2 changes: 1 addition & 1 deletion components/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ var test = (function(){

userInfo.name.set(trim(superXSS(tempInfo.name)));
userInfo.language.set(superXSS(tempInfo.language));
userInfo.about.set(trim(superXSS(tempInfo.about)));
userInfo.about.set(findAndReplaceLinkClearReverse(trim(superXSS(tempInfo.about))));
userInfo.site.set(trim(superXSS(tempInfo.site)));
userInfo.image.set(superXSS(tempInfo.image));
userInfo.addresses.set(tempInfo.addresses);
Expand Down
130 changes: 130 additions & 0 deletions config/Bastyon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"url" : "bastyon.com",
"turl" : "test.pocketnet.app",
"name" : "Bastyon",
"fullname" : "Bastyon",
"developapps" : [],
"protocol" : "bastyon",
"blockexplorer" : "https://pocketnet.app/blockexplorer/",
"servers" : {
"production" : {
"proxy" : [
{
"host" : "1.pocketnet.app",
"port" : 8899,
"wss" : 8099
},

{
"host" : "2.pocketnet.app",
"port" : 8899,
"wss" : 8099
},

{
"host" : "3.pocketnet.app",
"port" : 8899,
"wss" : 8099
},
{
"host" : "6.pocketnet.app",
"port" : 8899,
"wss" : 8099
}
],

"translateProxy" : {
"host" : "2.pocketnet.app",
"port" : 8899,
"wss" : 8099
},

"matrix" : "matrix.pocketnet.app"
},

"test" : {
"proxy" : [
{
"host" : "test.pocketnet.app",
"port" : 8899,
"wss" : 8099
}
],

"translateProxy" : {
"host" : "2.pocketnet.app",
"port" : 8899,
"wss" : 8099
},

"matrix" : "test.matrix.pocketnet.app"
}
},
"forbiddenNames" : [
"bastyon", "pocketnet"
],
"applications" : {
"ui" : {
"android" : {
"github" : {
"name": "Bastyon.apk",
"gfname": "BastyonGF.apk",
"url": "https://api.github.com/repos/pocketnetapp/pocketnet.gui/releases/latest"
},
"href" : "https://play.google.com/store/apps/details?id=pocketnet.app"
},
"ios" : {
"href" : "https://apps.apple.com/app/id1537944200"
},
"windows" : {
"github" : {
"name": "BastyonSetup.exe",
"url": "https://api.github.com/repos/pocketnetapp/pocketnet.gui/releases/latest"
}
},
"macos" : {
"github" : {
"name": "BastyonSetup.dmg",
"url": "https://api.github.com/repos/pocketnetapp/pocketnet.gui/releases/latest",
"page": "https://github.com/pocketnetteam/pocketnet.gui/blob/master/README.md#download-bastyon-on-your-devices"
}
},
"linux" : {
"github" : {
"name": "BastyonSetup.deb",
"url": "https://api.github.com/repos/pocketnetapp/pocketnet.gui/releases/latest",
"page": "https://github.com/pocketnetteam/pocketnet.gui/blob/master/README.md#download-bastyon-on-your-devices"
}
}
},
"node": {
"windows": {
"github": {
"name": "pocketnetcore_0.22.0_win_x64_setup.exe",
"url": "https://api.github.com/repos/pocketnetapp/pocketnet.core/releases/latest"
}
},

"linux": {
"github": {
"name": "Pocketnet_linux_x64.AppImage",
"url": "https://api.github.com/repos/pocketnetapp/pocketnet.core/releases/latest"
}
}
}
},

"cordova" : {
"name" : "pocketnet.app",
"displayName" : "Pocketnet",
"iosTeamId" : "Y5JW9JU787",
"reversedClientId" : "com.googleusercontent.apps.1020521924918-0he8n2cuadpvdm9mi2dv9vj8llr8pgr1",
"iosUrlScheme" : "pocketnet",
"groupIdentifier" : "group.app.pocketnet"
},

"electron" : {
"protocol" : "bastyon"
}

}
Loading