Some fixes and changes thanks to @Liru

This change removes some redundant code, fixes a minor potential memory leak, and implements a missing feature with the two notifications OfferFriendship and OfferFriendshipNoMessage.