nostr/iris-messenger
1
0
Fork 0
mirror of https://github.com/irislib/iris-messenger.git synced 2024-09-19 17:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

block posts and profile photo from blocked users

Browse Source
This commit is contained in:
Martti Malmi 2021-07-15 18:37:57 +03:00
parent 9836e79915
commit d1b4b7d0c9
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/components/Identicon.js
View File

@ -12,6 +12,7 @@ class Identicon extends Component {
shouldComponentUpdate(nextProps, nextState) {
if (nextProps.str !== this.props.str) return true;
if (nextProps.hidePhoto !== this.props.hidePhoto) return true;
if (nextState.photo !== this.state.photo) return true;
if (nextState.name !== this.state.name) return true;
if (nextState.activity !== this.state.activity) return true;
@ -23,16 +24,23 @@ class Identicon extends Component {
$(this.base).empty();
this.componentDidMount();
}
if (prevProps.hidePhoto !== this.props.hidePhoto) {
$(this.base).find('.iris-identicon').toggle(!this.state.photo || this.props.hidePhoto);
}
}
componentDidMount() {
const pub = this.props.str;
this.identicon = new iris.Attribute({type: 'keyID', value: pub}).identicon({width: this.props.width, showType: false});
this.base.appendChild(this.identicon);
if (!this.props.hidePhoto) {
State.public.user(pub).get('profile').get('photo').on(photo => { // TODO: limit size
$(this.base).find('.iris-identicon').toggle(!photo);
$(this.base).find('.iris-identicon').toggle(!photo || this.props.hidePhoto);
this.setState({photo});
});
} else {
$(this.base).find('.iris-identicon').show();
}
this.setState({activity: null});
if (this.props.showTooltip) {
@ -68,7 +76,7 @@ class Identicon extends Component {
return html`
<div onClick=${this.props.onClick} style="${this.props.onClick ? 'cursor: pointer;' : ''} position: relative;" class="identicon-container ${this.props.showTooltip ? 'tooltip' : ''} ${activity}">
<div style="width: ${width}; height: ${width}" class="identicon">
${this.state.photo ? html`<${SafeImg} src=${this.state.photo} class="identicon-image" width=${width}/>` : ''}
${(this.state.photo && !this.props.hidePhoto) ? html`<${SafeImg} src=${this.state.photo} class="identicon-image" width=${width}/>` : ''}
</div>
${this.props.showTooltip && this.state.name ? html`<span class="tooltiptext">${this.state.name}</span>` : ''}
${this.props.activity ? html`<div class="online-indicator"/>` : ''}

29
src/js/views/Profile.js
View File

@ -26,7 +26,7 @@ function deleteChat(pub) {
class Profile extends View {
constructor() {
super();
this.eventListeners = [];
this.eventListeners = {};
this.followedUsers = new Set();
this.followers = new Set();
this.id = "profile";
@ -110,10 +110,10 @@ class Profile extends View {
if (this.isMyProfile) {
profilePhoto = html`<${ProfilePhotoPicker} currentPhoto=${this.state.photo} placeholder=${this.props.id} callback=${src => this.onProfilePhotoSet(src)}/>`;
} else {
if (this.state.photo) {
if (this.state.photo && !this.state.blocked) {
profilePhoto = html`<${SafeImg} class="profile-photo" src=${this.state.photo}/>`
} else {
profilePhoto = html`<${Identicon} str=${this.props.id} width=250/>`
profilePhoto = html`<${Identicon} str=${this.props.id} hidePhoto=${this.state.blocked} width=250/>`
}
}
return html`
@ -211,19 +211,18 @@ class Profile extends View {
return html`
<div class="content">
${this.renderDetails()}
${this.renderTabs()}
${this.renderTab()}
${this.state.blocked ? '' : this.renderTabs()}
${this.state.blocked ? '' : this.renderTab()}
</div>
`;
}
componentWillUnmount() {
this.eventListeners.forEach(e => e.off());
Object.values(this.eventListeners).forEach(e => e.off());
}
componentDidUpdate(prevProps) {
if (prevProps.id !== this.props.id) {
this.setState({memberCandidate:null});
this.componentDidMount();
}
}
@ -231,7 +230,7 @@ class Profile extends View {
getProfileDetails() {
const pub = this.props.id;
State.public.user(pub).get('follow').map().on((following,key,c,e) => {
this.eventListeners.push(e);
this.eventListeners['follow'] = e;
if (following) {
this.followedUsers.add(key);
} else {
@ -251,17 +250,17 @@ class Profile extends View {
});
State.public.user(pub).get('profile').get('name').on((name,a,b,e) => {
document.title = name || document.title;
this.eventListeners.push(e);
this.eventListeners['name'] = e;
if (!$('#profile .profile-name:focus').length) {
this.setState({name});
}
});
State.public.user(pub).get('profile').get('photo').on((photo,a,b,e) => {
this.eventListeners.push(e);
this.eventListeners['photo'] = e;
this.setState({photo});
});
State.public.user(pub).get('profile').get('about').on((about,a,b,e) => {
this.eventListeners.push(e);
this.eventListeners['about'] = e;
if (!$('#profile .profile-about-content:focus').length) {
this.setState({about});
} else {
@ -272,8 +271,8 @@ class Profile extends View {
componentDidMount() {
const pub = this.props.id;
this.eventListeners.forEach(e => e.off());
this.setState({followedUserCount: 0, followerCount: 0, name: '', photo: '', about: ''});
Object.values(this.eventListeners).forEach(e => e.off());
this.setState({followedUserCount: 0, followerCount: 0, name: '', photo: '', about: '', blocked: false});
this.isMyProfile = Session.getPubKey() === pub;
const chat = Session.channels[pub];
if (pub.length < 40) {
@ -305,6 +304,10 @@ class Profile extends View {
colorLight : "#ffffff",
correctLevel : QRCode.CorrectLevel.H
});
State.public.user().get('block').get(this.props.id).on((blocked,k,x,e) => {
this.eventListeners['block'] = e;
this.setState({blocked});
})
}
}