add filemessage download

Author: wangying

demo/src/components/blacklist/BlacklistModal.js

@@ -18,7 +18,7 @@ class BlacklistModal extends React.Component {
         const items = blacklist.names.map((name, index) => {
             return (
                 <p key={name} style={{ height: 30 }}>
-                    {name}
+                    {blacklist.byName[name]}
                     <i
                         style={{
                             cursor: 'pointer', 'margin-right': '16px'

demo/src/components/chat/ChatMessage.js

@@ -148,7 +148,9 @@ export default class ChatMessage extends Component {
         }
 
     }
-
+    handleClick = (e)=>{
+        e.stopPropagation();
+    }
 
     render() {
         const { bySelf, from, time, body, status, toJid, fromNick, id } = this.props
@@ -235,9 +237,9 @@ export default class ChatMessage extends Component {
                                     </p>
                                 </div>
                                 <div className="ant-col-12">
-                                    {/* <a href={body.url} download={body.filename}>
+                                    {!bySelf && <a href={body.url} download={body.filename} onClick={this.handleClick}>
                                         {I18n.t('download')}
-                                    </a> */}
+                                    </a>}
                                 </div>
                             </div>
                         </div>

demo/src/redux/BlacklistRedux.js

@@ -14,52 +14,42 @@ const { Types, Creators } = createActions({
     getBlacklist: () => {
         return (dispatch, getState) => {
             WebIM.conn.getBlocklist().then(res=>{
-                dispatch(Creators.updateBlacklist(res.data))
+                res.data && dispatch(Creators.updateBlacklist(res.data))
             })
         }
     },
     // add to black list
     doAddBlacklist: id => {
         return (dispatch, getState) => {
             dispatch(CommonActions.fetching())
+            try{
+                WebIM.conn.addUsersToBlocklist({name:id});
+                let blacklist = getState().entities.blacklist.byName.asMutable()
+                let index = blacklist.findIndex(i=>blacklist[i]==id)
+                if(index>-1) return
+                blacklist.push(id);
+                dispatch(Creators.updateBlacklist(blacklist))
+            }catch(e){
 
-            let blacklist = getState().entities.blacklist.byName.asMutable()
-            let roster = getState().entities.roster.byName
-            if (blacklist[id]) return
-            blacklist[id] = roster[id]
-            WebIM.conn.addToBlackList({
-                // list: blacklist,
-                // type: "jid",
-                name: id,
-                success: function () {
-                    // TODO: add to black list directly , shouldn't  re-pull
-                    dispatch(CommonActions.fetched())
-                },
-                error: function () {
-                    dispatch(CommonActions.fetched())
-                }
-            })
+            }finally{
+                dispatch(CommonActions.fetched())
+            }
         }
     },
     // delete from blacklist
     doRemoveBlacklist: id => {
         return (dispatch, getState) => {
             dispatch(CommonActions.fetching())
-
-            let blacklist = getState().entities.blacklist.byName.asMutable()
-            delete blacklist[id]
-            WebIM.conn.removeFromBlackList({
-                // list: blacklist,
-                // type: "jid",
-                name: id,
-                success: function () {
-                    // TODO: delete from black list directly , shouldn't  re-pull
-                    dispatch(CommonActions.fetched())
-                },
-                error: function () {
-                    dispatch(CommonActions.fetched())
-                }
-            })
+            try{
+                let blacklist = getState().entities.blacklist.byName.asMutable()
+                WebIM.conn.removeUserFromBlackList({name:blacklist[id]})
+                blacklist.splice(id,1)
+                dispatch(Creators.updateBlacklist(blacklist))
+                dispatch(CommonActions.fetched())
+                // delete blacklist[id]
+            }catch(e){
+                dispatch(CommonActions.fetched())
+            }
         }
     }
 })

demo/src/redux/RosterRedux.js

@@ -48,32 +48,20 @@ const { Types, Creators } = createActions({
         return (dispatch, getState) => {
             //loading
             dispatch(CommonActions.fetching())
-            WebIM.conn.deleteContact({
-                to: id,
-                success: function() {
-                    //loading end
-                    dispatch(CommonActions.fetched())
-                    dispatch(Creators.getContacts())
-
-                    // WebIM.conn.unsubscribed({
-                    //     to: id
-                    // })
-                },
-                error: function() {
-                    //TODO ERROR
-                    dispatch(CommonActions.fetched())
-                }
-            })
+            try{
+                WebIM.conn.deleteContact(id)
+                dispatch(CommonActions.fetched())
+                dispatch(Creators.getContacts())
+            }catch(e){
+                dispatch(CommonActions.fetched())
+            }
         }
     },
     // add contact
     addContact: id => {
         return (dispatch, getState) => {
             const u = getState().login.username
-            WebIM.conn.addContact({
-                to: id,
-                message: u + I18n.t('request')
-            })
+            WebIM.conn.addContact(id,u + I18n.t('request'))
         }
     },
 

demo/src/redux/SubscribeRedux.js

@@ -16,10 +16,7 @@ const { Types, Creators } = createActions({
         return (dispatch, getState) => {
             dispatch(Creators.removeSubscribe(name))
 
-            WebIM.conn.acceptContactInvite({
-                to: name,
-                message: '[resp:true]'
-            })
+            WebIM.conn.acceptContactInvite(name)
         }
     },
 
@@ -28,10 +25,7 @@ const { Types, Creators } = createActions({
         return (dispatch, getState) => {
             dispatch(Creators.removeSubscribe(name))
 
-            WebIM.conn.declineContactInvite({
-                to: name,
-                message: new Date().toLocaleString()
-            })
+            WebIM.conn.declineContactInvite(name)
         }
     }
 })

simpleDemo/easmeob-im/friend.js

@@ -10,17 +10,12 @@ $(function () {
     })
     //添加好友
     $("#addRoster").click(function () {
-        WebIM.conn.addContact({
-            to: toID,
-            message: '加个好友呗!'
-        });
+        WebIM.conn.addContact(toID,u + '加个好友呗!')
         $('toName').val('');
     })
     //删除好友
     $('#removeRoster').click(function () {
-        WebIM.conn.deleteContact({
-            to: toID
-        });
+        WebIM.conn.deleteContact(toID)
         $('#toName').val('');
     })
     //获取黑名单列表

simpleDemo/utils/initWeb.js

@@ -110,17 +110,14 @@ WebIM.conn.listen({
                 var truthBeTold = window.confirm((message.from + "申请添加您为好友:"));
                 if (truthBeTold) {
                     // 同意对方添加好友
-                    WebIM.conn.acceptContactInvite({
-                        to: message.from,
-                        message: "[resp:true]"
-                    });
+                    WebIM.conn.acceptContactInvite(message.from)
+
                     console.log("同意添加好友");
                 } else {
                     // 拒绝对方添加好友
-                    WebIM.conn.declineContactInvite({
-                        to: message.from,
-                        message: "rejectAddFriend" // 拒绝添加好友回复信息
-                    });
+                    WebIM.conn.declineContactInvite(
+                     message.from // 拒绝添加好友回复信息
+                    );
                     console.log("拒绝添加好友");
                 }
                 break;